From 7f5d3081d1f1e3fdd3601d0a98b17551b3b4116bc949e88025ff4c756ec71429 Mon Sep 17 00:00:00 2001 From: Atri Bhattacharya Date: Fri, 31 Jul 2020 09:25:43 +0000 Subject: [PATCH] Accepting request 823615 from home:bmwiedemann:branches:Application:Geo Add reproducible.patch to make build results independent of build machine CPU (boo#1100677) OBS-URL: https://build.opensuse.org/request/show/823615 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/insighttoolkit?expand=0&rev=25 --- insighttoolkit.changes | 6 ++++++ insighttoolkit.spec | 2 ++ reproducible.patch | 20 ++++++++++++++++++++ 3 files changed, 28 insertions(+) create mode 100644 reproducible.patch diff --git a/insighttoolkit.changes b/insighttoolkit.changes index 7947163..44715d9 100644 --- a/insighttoolkit.changes +++ b/insighttoolkit.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jul 30 15:58:02 UTC 2020 - Bernhard Wiedemann + +- Add reproducible.patch to make build results independent + of build machine CPU (boo#1100677) + ------------------------------------------------------------------- Tue Jul 14 22:09:20 UTC 2020 - Atri Bhattacharya diff --git a/insighttoolkit.spec b/insighttoolkit.spec index 7ad421f..193bf1e 100644 --- a/insighttoolkit.spec +++ b/insighttoolkit.spec @@ -37,6 +37,8 @@ Patch1: nrrdio-linking.patch Patch3: itklbfgs-linking.patch # PATCH-FIX-UPSTREAM insighttoolkit-drop-netlib-triangle-files.patch [gh#InsightSoftwareConsortium/ITK#1913] badshah400@gmail.com -- Drop netlib triangle files and any linking to them due to licensing issues; patch from upstream Patch4: insighttoolkit-drop-netlib-triangle-files.patch +# PATCH-FIX-OPENSUSE reproducible.patch boo#1100677 +Patch100: reproducible.patch BuildRequires: CastXML-devel BuildRequires: bison BuildRequires: cmake diff --git a/reproducible.patch b/reproducible.patch new file mode 100644 index 0000000..4961cf3 --- /dev/null +++ b/reproducible.patch @@ -0,0 +1,20 @@ +Author: Bernhard M. Wiedemann +Date: 2020-07-30 + +https://bugzilla.opensuse.org/show_bug.cgi?id=1100677 + +packages do not build reproducibly from compile-time CPU-detection + +Index: InsightToolkit-5.1.0/CMake/ITKSetStandardCompilerFlags.cmake +=================================================================== +--- InsightToolkit-5.1.0.orig/CMake/ITKSetStandardCompilerFlags.cmake ++++ InsightToolkit-5.1.0/CMake/ITKSetStandardCompilerFlags.cmake +@@ -241,7 +241,7 @@ function(check_compiler_optimization_fla + set(InstructionSetOptimizationFlags + # https://gcc.gnu.org/onlinedocs/gcc-4.8.0/gcc/i386-and-x86_002d64-Options.html + # NOTE the corei7 release date was 2008 +- -mtune=native # Tune the code for the computer used compile ITK, but allow running on generic cpu archetectures ++ #-mtune=native # boo#1100677 - disabled to not consider build machine CPU for reproducible results + -march=corei7 # Use ABI settings to support corei7 (circa 2008 ABI feature sets, core-avx circa 2013) + ) + endif()