Hello community,

here is the log from the commit of package hpx for openSUSE:Factory checked in 
at 2018-12-05 09:46:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/hpx (Old)
 and      /work/SRC/openSUSE:Factory/.hpx.new.19453 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "hpx"

Wed Dec  5 09:46:23 2018 rev:2 rq:654120 version:1.2.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/hpx/hpx.changes  2018-11-29 22:59:05.455603252 
+0100
+++ /work/SRC/openSUSE:Factory/.hpx.new.19453/hpx.changes       2018-12-05 
09:46:23.924508213 +0100
@@ -1,0 +2,6 @@
+Tue Dec  4 13:49:26 UTC 2018 - Bernhard Wiedemann <[email protected]>
+
+- Add reproducible.patch to not consider the build machine CPU
+  capabilities for the build result (boo#1100677)
+
+-------------------------------------------------------------------

New:
----
  reproducible.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ hpx.spec ++++++
--- /var/tmp/diff_new_pack.5Q0jYj/_old  2018-12-05 09:46:24.472507614 +0100
+++ /var/tmp/diff_new_pack.5Q0jYj/_new  2018-12-05 09:46:24.476507610 +0100
@@ -43,6 +43,8 @@
 Patch0:         https://github.com/STEllAR-GROUP/hpx/pull/3551.patch
 #PATCH-FIX-UPSTREAM 3557.patch, fix build on ppc64, 
https://github.com/STEllAR-GROUP/hpx/pull/3557
 Patch1:         3557.patch
+#PATCH-FIX-OPENSUSE boo#1100677 avoid compile-time CPU-detection
+Patch2:         reproducible.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -104,6 +106,7 @@
 %setup -n %{name}_%{version} -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %ifarch aarch64 s390x armv7hl ppc64

++++++ reproducible.patch ++++++
Author: Bernhard M. Wiedemann <bwiedemann suse de>
Date: 2018-12-04

Do not use the rdtscp instruction, even if it is available
on a random build machine. It might not be on the target machine.

For https://bugzilla.opensuse.org/show_bug.cgi?id=1100677 :
packages do not build reproducibly from compile-time CPU-detection

Index: hpx_1.2.0/CMakeLists.txt
===================================================================
--- hpx_1.2.0.orig/CMakeLists.txt
+++ hpx_1.2.0/CMakeLists.txt
@@ -1475,8 +1475,6 @@ else()
 
   # XeonPhi's do not support RDTSCP
   if(NOT ("${HPX_PLATFORM_UC}" STREQUAL "XEONPHI"))
-    hpx_cpuid("rdtscp" HPX_WITH_RDTSCP
-      DEFINITIONS HPX_HAVE_RDTSCP)
   endif()
 
   if(NOT HPX_WITH_RDTSC AND NOT HPX_WITH_RDTSCP)

Reply via email to