From edbc2bdf07c353ff04aac46e6b22f6c919807c076a7ecc299d22ac00d9aa696b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sun, 5 Jan 2020 07:53:45 +0000 Subject: [PATCH] Accepting request 760838 from home:bmwiedemann:branches:devel:languages:python:numeric Add reproducible.patch to disable optimizing for build CPU to make package build reproducible OBS-URL: https://build.opensuse.org/request/show/760838 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-sherpa?expand=0&rev=3 --- python-sherpa.changes | 6 ++++++ python-sherpa.spec | 1 + reproducible.patch | 26 ++++++++++++++++++++++++++ 3 files changed, 33 insertions(+) create mode 100644 reproducible.patch diff --git a/python-sherpa.changes b/python-sherpa.changes index ab73065..e0b4213 100644 --- a/python-sherpa.changes +++ b/python-sherpa.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Jan 4 20:12:21 UTC 2020 - Bernhard Wiedemann + +- Add reproducible.patch to disable optimizing for build CPU + to make package build reproducible + ------------------------------------------------------------------- Tue Jan 8 19:14:59 UTC 2019 - Todd R diff --git a/python-sherpa.spec b/python-sherpa.spec index 7412a13..0ce2f85 100644 --- a/python-sherpa.spec +++ b/python-sherpa.spec @@ -27,6 +27,7 @@ URL: https://github.com/sherpa/sherpa/ Source: https://github.com/sherpa/sherpa/archive/%{version}.tar.gz#/sherpa-%{version}.tar.gz # PATCH-FIX-UPSTREAM config_with_build.patch -- https://github.com/sherpa/sherpa/pull/714 Patch0: config_with_build.patch +Patch1: reproducible.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module numpy-devel} BuildRequires: %{python_module setuptools} diff --git a/reproducible.patch b/reproducible.patch new file mode 100644 index 0000000..92cab9c --- /dev/null +++ b/reproducible.patch @@ -0,0 +1,26 @@ +Index: sherpa-4.12.0/extern/fftw-3.3.8/configure +=================================================================== +--- sherpa-4.12.0.orig/extern/fftw-3.3.8/configure ++++ sherpa-4.12.0/extern/fftw-3.3.8/configure +@@ -14506,7 +14506,7 @@ main () + } + _ACEOF + if ac_fn_c_try_compile "$LINENO"; then : +- ax_cv_c_flags__mtune_native=yes ++ ax_cv_c_flags__mtune_native=no + else + ax_cv_c_flags__mtune_native=no + fi +Index: sherpa-4.12.0/extern/fftw-3.3.8/m4/ax_cc_maxopt.m4 +=================================================================== +--- sherpa-4.12.0.orig/extern/fftw-3.3.8/m4/ax_cc_maxopt.m4 ++++ sherpa-4.12.0/extern/fftw-3.3.8/m4/ax_cc_maxopt.m4 +@@ -73,7 +73,7 @@ if test "$ac_test_CFLAGS" != "set"; then + CFLAGS="-O3 -fomit-frame-pointer" + + # tune for the host by default +- AX_CHECK_COMPILER_FLAGS(-mtune=native, CFLAGS="$CFLAGS -mtune=native") ++ #AX_CHECK_COMPILER_FLAGS(-mtune=native, CFLAGS="$CFLAGS -mtune=native") + + # -malign-double for x86 systems + AX_CHECK_COMPILER_FLAGS(-malign-double, CFLAGS="$CFLAGS -malign-double")