Hello community, here is the log from the commit of package gasnet for openSUSE:Factory checked in at 2017-06-20 09:40:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gasnet (Old) and /work/SRC/openSUSE:Factory/.gasnet.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gasnet" Tue Jun 20 09:40:37 2017 rev:5 rq:504597 version:1.28.2 Changes: -------- --- /work/SRC/openSUSE:Factory/gasnet/gasnet.changes 2017-06-04 02:00:51.903426087 +0200 +++ /work/SRC/openSUSE:Factory/.gasnet.new/gasnet.changes 2017-06-20 09:40:38.817939590 +0200 @@ -1,0 +2,13 @@ +Fri Jun 9 08:17:36 UTC 2017 - nmoreychaisemar...@suse.com + +- Enable OFI conduit on x86_64 +- Disable debug to build GASnet in optimized mode +- Add gasnet-date-time.patch to remove build date/times from binaries +- Add gasnet-s390-support.patch and enable s390/s390x builds + +------------------------------------------------------------------- +Thu Jun 8 11:37:26 UTC 2017 - nmoreychaisemar...@suse.com + +- Remove version dependency to libibverbs + +------------------------------------------------------------------- New: ---- gasnet-date-time.patch gasnet-s390-support.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gasnet.spec ++++++ --- /var/tmp/diff_new_pack.IL398b/_old 2017-06-20 09:40:39.769805383 +0200 +++ /var/tmp/diff_new_pack.IL398b/_new 2017-06-20 09:40:39.769805383 +0200 @@ -1,7 +1,7 @@ # # spec file for package gasnet # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,20 +19,21 @@ %define _buildshell /bin/bash Name: gasnet Version: 1.28.2 -%define libver 1_28_2 Release: 0 +%define libver 1_28_2 Summary: A Communication Layer for GAS Languages License: PostgreSQL Group: Productivity/Networking/Other Url: https://bitbucket.org/berkeleylab/gasnet/ Source0: https://bitbucket.org/berkeleylab/gasnet/downloads/GASNet-%{version}.tar.gz +Patch0: gasnet-date-time.patch +Patch1: gasnet-s390-support.patch BuildRequires: automake BuildRequires: fdupes BuildRequires: gcc-c++ -# For transition to rdma-core make sure the new packages are selected -# Once the transition is made the version check can be removed -BuildRequires: libibverbs-devel >= 12 +BuildRequires: libibverbs-devel %ifarch x86_64 +BuildRequires: infinipath-psm BuildRequires: libfabric-devel BuildRequires: libpsm2-compat BuildRequires: libpsm2-devel @@ -40,7 +41,6 @@ BuildRequires: libtool BuildRequires: openmpi BuildRequires: openmpi-devel -ExcludeArch : s390 s390x BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -95,6 +95,8 @@ %prep %setup -q -n GASNet-%{version} +%patch0 +%patch1 # Avoid unnecessary rebuilds of the package FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') @@ -102,7 +104,16 @@ sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" gasnet_tools.c gasnet_trace.c tests/test.h %build -%configure --enable-udp --enable-mpi --enable-par --enable-ibv --disable-aligned-segments --enable-segment-fast --with-segment-mmap-max=4GB CC="gcc -fPIC" CXX="g++ -fPIC" +%configure --enable-udp --enable-mpi --enable-par --enable-ibv --disable-aligned-segments --enable-segment-fast --with-segment-mmap-max=4GB --disable-debug \ +%ifarch x86_64 + --enable-ofi \ +%endif +%ifarch s390 s390x + --enable-force-compiler-atomicops \ +%endif + + CC="gcc -fPIC" CXX="g++ -fPIC" + make %{?_smp_mflags} MANUAL_CFLAGS="%optflags -fPIC" MANUAL_MPICFLAGS="%optflags -fPIC" MANUAL_CXXFLAGS="%optflags -fPIC" %check ++++++ gasnet-date-time.patch ++++++ diff --git gasnet_tools.c gasnet_tools.c index 756c7ef..0883b2e 100644 --- gasnet_tools.c +++ gasnet_tools.c @@ -316,9 +316,6 @@ GASNETI_IDENT(gasnett_IdentString_ThreadModel, "$GASNetToolsThreadModel: " GASNE GASNETI_IDENT(gasnett_IdentString_Config, "$GASNetToolsConfig: " GASNETT_CONFIG_STRING " $"); -GASNETI_IDENT(gasnett_IdentString_BuildTimestamp, - "$GASNetBuildTimestamp: " __DATE__ " " __TIME__ " $"); - GASNETI_IDENT(gasnett_IdentString_BuildID, "$GASNetBuildId: " GASNETI_BUILD_ID " $"); GASNETI_IDENT(gasnett_IdentString_ConfigureArgs, diff --git gasnet_trace.c gasnet_trace.c index 5d1225d..9c75cac 100644 --- gasnet_trace.c +++ gasnet_trace.c @@ -1063,7 +1063,6 @@ extern void gasneti_trace_init(int *pargc, char ***pargv) { } gasneti_tracestats_printf("GASNET_CONFIG_STRING: %s", GASNET_CONFIG_STRING); - gasneti_tracestats_printf("GASNet build timestamp: " __DATE__ " " __TIME__); gasneti_tracestats_printf("GASNet configure args: %s", GASNETI_CONFIGURE_ARGS); gasneti_tracestats_printf("GASNet configure buildid: " GASNETI_BUILD_ID); gasneti_tracestats_printf("GASNet system tuple: " GASNETI_SYSTEM_TUPLE); ++++++ gasnet-s390-support.patch ++++++ diff --git gasnet_membar.h gasnet_membar.h index f1376c4..1204183 100644 --- gasnet_membar.h +++ gasnet_membar.h @@ -260,6 +260,12 @@ #define gasneti_local_rmb() gasneti_local_mb() #define GASNETI_RMB_IS_MB #define GASNETI_WMB_IS_MB +#elif PLATFORM_ARCH_S390 && PLATFORM_COMPILER_GNU + #define gasneti_local_mb() __sync_synchronize() + #define gasneti_local_wmb() gasneti_local_mb() + #define gasneti_local_rmb() gasneti_local_mb() + #define GASNETI_RMB_IS_MB + #define GASNETI_WMB_IS_MB #else #error unknown CPU - dont know how to do a local memory barrier for your CPU/OS #endif diff --git other/gasnet_portable_platform.h other/gasnet_portable_platform.h index 917cb9b..4fe8776 100644 --- other/gasnet_portable_platform.h +++ other/gasnet_portable_platform.h @@ -157,6 +157,7 @@ #undef PLATFORM_ARCH_ARM #undef PLATFORM_ARCH_AARCH64 #undef PLATFORM_ARCH_TILE +#undef PLATFORM_ARCH_S390 #undef PLATFORM_ARCH_UNKNOWN /* prevent known old/broken versions of this header from loading */ @@ -925,6 +926,16 @@ #define _PLATFORM_ARCH_32 1 #endif +#elif defined(__s390__) + #define PLATFORM_ARCH_S390 1 + #define PLATFORM_ARCH_FAMILYNAME S390 + #define _PLATFORM_ARCH_BIG_ENDIAN 1 + #if defined(__s390x__) + #define _PLATFORM_ARCH_64 1 + #else + #define _PLATFORM_ARCH_32 1 + #endif + #else /* unknown CPU */ #define PLATFORM_ARCH_UNKNOWN 1 #define PLATFORM_ARCH_FAMILYNAME UNKNOWN
