From 65099d199a79115bb2009eb76b8b12c2ace8448247f0dff71eb24f82a27a6f04 Mon Sep 17 00:00:00 2001 From: Ana Guerrero Date: Thu, 27 Jul 2023 19:35:46 +0000 Subject: [PATCH 1/3] Accepting request 1095295 from home:bmwiedemann:reproducible Add 1.patch to make ghc builds reproducible (boo#1102408) OBS-URL: https://build.opensuse.org/request/show/1095295 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-rpm-macros?expand=0&rev=109 --- 1.patch | 25 +++++++++++++++++++++++++ ghc-rpm-macros.changes | 5 +++++ ghc-rpm-macros.spec | 3 +++ 3 files changed, 33 insertions(+) create mode 100644 1.patch diff --git a/1.patch b/1.patch new file mode 100644 index 0000000..01af498 --- /dev/null +++ b/1.patch @@ -0,0 +1,25 @@ +https://github.com/opensuse-haskell/ghc-rpm-macros/pull/1 + +From ea3438d89744e6a741c420b1aaaed9004c69af65 Mon Sep 17 00:00:00 2001 +From: "Bernhard M. Wiedemann" +Date: Sat, 15 Apr 2023 07:09:01 +0200 +Subject: [PATCH] Compile with only 1 thread + +parallel compile causes assignment of random symbol names +so we build single-threaded, which is slower, but gives reproducible results +--- + macros.ghc-suse | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/macros.ghc-suse b/macros.ghc-suse +index 3fe39a0..7c4a536 100644 +--- a/macros.ghc-suse ++++ b/macros.ghc-suse +@@ -29,4 +29,6 @@ mkdir -p %{buildroot}/usr/src/debug + %with_ghc_prof 1 + + # %%{?_smp_ncpus_max:--jobs=%%{?_smp_ncpus_max}} +-%ghc_smp_mflags %{?_smp_mflags} ++# parallel compile causes assignment of random symbol names ++# so we build single-threaded, which is slower, but gives reproducible results ++%ghc_smp_mflags -j1 diff --git a/ghc-rpm-macros.changes b/ghc-rpm-macros.changes index c3d2b33..3c225fa 100644 --- a/ghc-rpm-macros.changes +++ b/ghc-rpm-macros.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 26 03:34:18 UTC 2023 - Bernhard Wiedemann + +- Add 1.patch to make ghc builds reproducible (boo#1102408) + ------------------------------------------------------------------- Sat Mar 18 18:33:27 UTC 2023 - Ondřej Súkup diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 07d5301..42135d6 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -26,6 +26,8 @@ Group: Development/Libraries/Other URL: https://fedoraproject.org/wiki/Haskell_SIG # source gets updated with osc service dr Source0: %{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM https://github.com/opensuse-haskell/ghc-rpm-macros/pull/1 +Patch1: 1.patch BuildRequires: xz Requires: rpm Requires: chrpath @@ -50,6 +52,7 @@ for example in ghc and haskell-platform. %prep %setup -q +%patch1 -p1 %build echo no build stage needed From 8f10866594c37ca5ea9bdbcb881b95423026de84f71e9cfd6d86c27d59ab7968 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 27 Jul 2023 21:01:25 +0000 Subject: [PATCH 2/3] osc copypac from project:devel:languages:haskell:ghc-9.4.x package:ghc-rpm-macros revision:13, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-rpm-macros?expand=0&rev=110 --- 1.patch | 25 ------------------------- ghc-rpm-macros.changes | 5 ----- ghc-rpm-macros.spec | 3 --- 3 files changed, 33 deletions(-) delete mode 100644 1.patch diff --git a/1.patch b/1.patch deleted file mode 100644 index 01af498..0000000 --- a/1.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://github.com/opensuse-haskell/ghc-rpm-macros/pull/1 - -From ea3438d89744e6a741c420b1aaaed9004c69af65 Mon Sep 17 00:00:00 2001 -From: "Bernhard M. Wiedemann" -Date: Sat, 15 Apr 2023 07:09:01 +0200 -Subject: [PATCH] Compile with only 1 thread - -parallel compile causes assignment of random symbol names -so we build single-threaded, which is slower, but gives reproducible results ---- - macros.ghc-suse | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/macros.ghc-suse b/macros.ghc-suse -index 3fe39a0..7c4a536 100644 ---- a/macros.ghc-suse -+++ b/macros.ghc-suse -@@ -29,4 +29,6 @@ mkdir -p %{buildroot}/usr/src/debug - %with_ghc_prof 1 - - # %%{?_smp_ncpus_max:--jobs=%%{?_smp_ncpus_max}} --%ghc_smp_mflags %{?_smp_mflags} -+# parallel compile causes assignment of random symbol names -+# so we build single-threaded, which is slower, but gives reproducible results -+%ghc_smp_mflags -j1 diff --git a/ghc-rpm-macros.changes b/ghc-rpm-macros.changes index 3c225fa..c3d2b33 100644 --- a/ghc-rpm-macros.changes +++ b/ghc-rpm-macros.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Mon Jun 26 03:34:18 UTC 2023 - Bernhard Wiedemann - -- Add 1.patch to make ghc builds reproducible (boo#1102408) - ------------------------------------------------------------------- Sat Mar 18 18:33:27 UTC 2023 - Ondřej Súkup diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 42135d6..07d5301 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -26,8 +26,6 @@ Group: Development/Libraries/Other URL: https://fedoraproject.org/wiki/Haskell_SIG # source gets updated with osc service dr Source0: %{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM https://github.com/opensuse-haskell/ghc-rpm-macros/pull/1 -Patch1: 1.patch BuildRequires: xz Requires: rpm Requires: chrpath @@ -52,7 +50,6 @@ for example in ghc and haskell-platform. %prep %setup -q -%patch1 -p1 %build echo no build stage needed From 343c7113c6f245bcf93ca1c88c421fa82a1d8acb98d21fae1b03be53477248c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Mon, 7 Aug 2023 03:46:21 +0000 Subject: [PATCH 3/3] Accepting request 1102610 from devel:languages:haskell:ghc-9.4.x - update to 2.5.3 * sync with upstream * add post and postun action into ghc subpackages as opensuse don't use filetriggers for ldconfig OBS-URL: https://build.opensuse.org/request/show/1102610 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-rpm-macros?expand=0&rev=111 --- ghc-rpm-macros-2.5.2.tar.xz | 3 --- ghc-rpm-macros-2.5.3.tar.xz | 3 +++ ghc-rpm-macros.changes | 8 ++++++++ ghc-rpm-macros.spec | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 ghc-rpm-macros-2.5.2.tar.xz create mode 100644 ghc-rpm-macros-2.5.3.tar.xz diff --git a/ghc-rpm-macros-2.5.2.tar.xz b/ghc-rpm-macros-2.5.2.tar.xz deleted file mode 100644 index d37dd46..0000000 --- a/ghc-rpm-macros-2.5.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:706ef0a8f12a778a637fd86faef52224c89f60674fb86764d0e8aa4a6835caeb -size 30852 diff --git a/ghc-rpm-macros-2.5.3.tar.xz b/ghc-rpm-macros-2.5.3.tar.xz new file mode 100644 index 0000000..59648ef --- /dev/null +++ b/ghc-rpm-macros-2.5.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0133a33facb3b6c38505836751a3db6469d7b4997244b4049ecc8a3be0afe799 +size 31116 diff --git a/ghc-rpm-macros.changes b/ghc-rpm-macros.changes index c3d2b33..8a62021 100644 --- a/ghc-rpm-macros.changes +++ b/ghc-rpm-macros.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Aug 6 14:34:29 UTC 2023 - Ondřej Súkup + +- update to 2.5.3 + * sync with upstream + * add post and postun action into ghc subpackages as opensuse + don't use filetriggers for ldconfig + ------------------------------------------------------------------- Sat Mar 18 18:33:27 UTC 2023 - Ondřej Súkup diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 07d5301..9b0e5fc 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -18,7 +18,7 @@ %global without_hscolour 1 Name: ghc-rpm-macros -Version: 2.5.2 +Version: 2.5.3 Release: 0 Summary: RPM Macros for building packages for GHC License: GPL-3.0-or-later