From 55f9a526fef03696accb18072f646e8320fb1193c6f74fcd86f491fa3eb27e2f Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 14 Jul 2018 10:44:46 +0000 Subject: [PATCH] Accepting request 622370 from home:bmwiedemann:branches:science Add reproducible.patch to disable compile-time CPU detection (boo#1100677) without this patch, /usr/bin/fflas-ffpack-config differed between CPUs OBS-URL: https://build.opensuse.org/request/show/622370 OBS-URL: https://build.opensuse.org/package/show/science/fflas-ffpack?expand=0&rev=31 --- fflas-ffpack.changes | 5 +++++ fflas-ffpack.spec | 2 ++ reproducible.patch | 14 ++++++++++++++ 3 files changed, 21 insertions(+) create mode 100644 reproducible.patch diff --git a/fflas-ffpack.changes b/fflas-ffpack.changes index 141d52d..09bd9ba 100644 --- a/fflas-ffpack.changes +++ b/fflas-ffpack.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jul 13 04:38:53 UTC 2018 - bwiedemann@suse.com + +- Add reproducible.patch to disable compile-time CPU detection (boo#1100677) + ------------------------------------------------------------------- Tue Jun 19 15:49:54 UTC 2018 - schwab@suse.de diff --git a/fflas-ffpack.spec b/fflas-ffpack.spec index bd6fc84..1c4b0b2 100644 --- a/fflas-ffpack.spec +++ b/fflas-ffpack.spec @@ -35,6 +35,7 @@ Url: https://linbox-team.github.io/fflas-ffpack/ #Git-Clone: https://github.com/linbox-team/fflas-ffpack Source: https://github.com/linbox-team/%name/archive/v%version.tar.gz +Patch0: reproducible.patch BuildRequires: doxygen BuildRequires: fdupes BuildRequires: gcc-c++ @@ -79,6 +80,7 @@ the FFLAS-FFPACK API. %prep %setup -q +%patch0 -p1 #Do not compile in DATE and TIME sed '/HTML_TIMESTAMP/s/YES/NO/' -i doc/Doxyfile diff --git a/reproducible.patch b/reproducible.patch new file mode 100644 index 0000000..142ff55 --- /dev/null +++ b/reproducible.patch @@ -0,0 +1,14 @@ +Index: fflas-ffpack-2.3.2/configure.ac +=================================================================== +--- fflas-ffpack-2.3.2.orig/configure.ac ++++ fflas-ffpack-2.3.2/configure.ac +@@ -172,9 +172,6 @@ echo "---------------------------------- + FF_CHECK_OMP + + +-# Checks which SIMD optimization flags to use and set SIMD_CFLAGS accordingly +-INSTR_SET +-AC_SUBST(SIMD_FLAGS) + + dnl gcc-4.9.2 bug See https://trac.sagemath.org/ticket/17635#comment:178 + AS_IF([ test "x$CCNAM" = "xgcc492" ],[REQUIRED_FLAGS="${REQUIRED_FLAGS} -fpermissive"],[])