Hello community, here is the log from the commit of package hpx for openSUSE:Factory checked in at 2018-12-21 08:21:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hpx (Old) and /work/SRC/openSUSE:Factory/.hpx.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hpx" Fri Dec 21 08:21:53 2018 rev:5 rq:660151 version:1.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/hpx/hpx.changes 2018-12-18 14:59:59.134107230 +0100 +++ /work/SRC/openSUSE:Factory/.hpx.new.28833/hpx.changes 2018-12-21 08:21:54.821542217 +0100 @@ -1,0 +2,5 @@ +Wed Dec 19 14:28:03 UTC 2018 - Bernhard Wiedemann <bwiedem...@suse.com> + +- Update reproducible.patch to match what was merged upstream + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hpx.spec ++++++ --- /var/tmp/diff_new_pack.OtMHkv/_old 2018-12-21 08:21:55.505541576 +0100 +++ /var/tmp/diff_new_pack.OtMHkv/_new 2018-12-21 08:21:55.505541576 +0100 @@ -40,7 +40,7 @@ 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 +#PATCH-FIX-UPSTREAM boo#1100677 avoid compile-time CPU-detection https://github.com/STEllAR-GROUP/hpx/pull/3585 Patch2: reproducible.patch #PATCH-FIX-UPSTREAM 3591.patch, fix build on arm, https://github.com/STEllAR-GROUP/hpx/pull/3591 Patch3: 3591.patch @@ -114,7 +114,7 @@ %endif . %{_libdir}/mpi/gcc/%{mpi_implem}/bin/mpivars.sh -%{cmake} -DLIB=%{_lib} %{?cmake_opts:%{cmake_opts}} +%{cmake} -DLIB=%{_lib} %{?cmake_opts:%{cmake_opts}} -DHPX_WITH_BUILD_BINARY_PACKAGE=ON make # no _smp_mflags to save memory %install ++++++ reproducible.patch ++++++ --- /var/tmp/diff_new_pack.OtMHkv/_old 2018-12-21 08:21:55.541541542 +0100 +++ /var/tmp/diff_new_pack.OtMHkv/_new 2018-12-21 08:21:55.545541539 +0100 @@ -1,22 +1,54 @@ -Author: Bernhard M. Wiedemann <bwiedemann suse de> -Date: 2018-12-04 +From cc013931216b39c3efeb87522231091e488b2704 Mon Sep 17 00:00:00 2001 +From: Patrick Diehl <patrickdi...@lsu.edu> +Date: Fri, 7 Dec 2018 11:52:09 -0600 +Subject: [PATCH] Add new hpx_option for the build on distribution's + infrastrucutres (refs #3575) -Do not use the rdtscp instruction, even if it is available -on a random build machine. It might not be on the target machine. +--- + CMakeLists.txt | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) -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() +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e0c8c44eaa7..a05c351077f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1055,6 +1055,12 @@ if((MSVC14 AND CMAKE_CL_64) OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")) + endif() + + ################################################################################ ++# Some special handling of the compilation is need on build infrastructure for ++# generating packages for target architecture, see issue #3575 ++ ++hpx_option(HPX_WITH_BUILD_BINARY_PACKAGE BOOL ++ "Build HPX on the build infrastructure on any LINUX distribution (default: OFF)." ++ OFF ADVANCED) + + ################################################################################ + # Add necessary compiler flags. Flags added here include flags to disable/enable +@@ -1478,18 +1484,26 @@ else() + hpx_add_compile_flag_if_available(-wd2536) + endif() + ++ + # rdtsc is an x86 instruction that reads the value of a CPU time stamp + # counter. rdtscp is an extension to rdtsc. The difference is that rdtscp is + # a serializing instruction. + hpx_cpuid("rdtsc" HPX_WITH_RDTSC + DEFINITIONS HPX_HAVE_RDTSC) ++ # One can not assume if RDTSCP is available on the hardware ++ # of the build infrastructure, that it will be available on ++ # all potential target hardware, see Issue #3575 ++ if(NOT ${HPX_WITH_BUILD_BINARY_PACKAGE}) ++ # XeonPhi's do not support RDTSCP if(NOT ("${HPX_PLATFORM_UC}" STREQUAL "XEONPHI")) -- hpx_cpuid("rdtscp" HPX_WITH_RDTSCP -- DEFINITIONS HPX_HAVE_RDTSCP) + hpx_cpuid("rdtscp" HPX_WITH_RDTSCP + DEFINITIONS HPX_HAVE_RDTSCP) endif() ++ endif() ++ if(NOT HPX_WITH_RDTSC AND NOT HPX_WITH_RDTSCP) + hpx_warn("Neither rdtsc nor rdtscp is available; some performance counters may report incorrect results") + endif()
