From 1ffbf6729ad3e35688ca5d940bbdfa4363df908cda01371c9f538b105cb99c15 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 25 Oct 2023 17:35:42 +0000 Subject: [PATCH] osc copypac from project:openSUSE:Factory package:ghc-rpm-macros revision:44, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-rpm-macros?expand=0&rev=114 --- ghc-rpm-macros.changes | 14 +------------- ghc-rpm-macros.spec | 3 +-- reproducible-builds.patch | 25 ------------------------- 3 files changed, 2 insertions(+), 40 deletions(-) delete mode 100644 reproducible-builds.patch diff --git a/ghc-rpm-macros.changes b/ghc-rpm-macros.changes index 73d2844..8a62021 100644 --- a/ghc-rpm-macros.changes +++ b/ghc-rpm-macros.changes @@ -1,15 +1,3 @@ -------------------------------------------------------------------- -Tue Oct 24 14:39:05 UTC 2023 - Peter Simons - -- Apply "reproducible-builds.patch", which makes GHC output - deterministic by disabling multi-threaded compilation. Adding - - %define %ghc_smp_mflags %{?_smp_mflags} - - to an OBS project configuration re-enables multi-threaded builds, - which might be useful for development projects that don't deliver - binaries. - ------------------------------------------------------------------- Sun Aug 6 14:34:29 UTC 2023 - Ondřej Súkup @@ -36,7 +24,7 @@ Thu Mar 16 18:26:11 UTC 2023 - Ondřej Súkup ------------------------------------------------------------------- Mon Nov 1 05:59:41 UTC 2021 - Ondřej Súkup -- fix build, remove white space +- fix build, remove white space ------------------------------------------------------------------- Mon May 10 10:37:06 UTC 2021 - Ondřej Súkup diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index b4b6f46..9b0e5fc 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -26,7 +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 -Patch1: https://github.com/opensuse-haskell/ghc-rpm-macros/pull/1.patch#/reproducible-builds.patch BuildRequires: xz Requires: rpm Requires: chrpath @@ -50,7 +49,7 @@ Extra macros used for subpackaging of Haskell libraries, for example in ghc and haskell-platform. %prep -%autosetup -p1 +%setup -q %build echo no build stage needed diff --git a/reproducible-builds.patch b/reproducible-builds.patch deleted file mode 100644 index 17a50aa..0000000 --- a/reproducible-builds.patch +++ /dev/null @@ -1,25 +0,0 @@ -From fc753c7f752ea77650ca708104acc384f025dd54 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 - -but give an option to do fast non-deterministic builds - -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..61a154a 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 for distribution releases we build single-threaded, which is slower, but gives reproducible results -+# for devel project set ghc_smp_flags in Macros