From 1bb8a7934f586f13afe7e941ff14c499ea24f3967d8dafff1a3d995d375c8112 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 23 Jun 2018 08:34:02 +0000 Subject: [PATCH] Accepting request 618096 from home:NMoreyChaisemartin:branches:science:HPC - Remove libnuma-devel on s390x for older releases OBS-URL: https://build.opensuse.org/request/show/618096 OBS-URL: https://build.opensuse.org/package/show/science:HPC/openucx?expand=0&rev=19 --- openucx.changes | 5 +++++ openucx.spec | 15 ++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/openucx.changes b/openucx.changes index 9a67b2b..ff9c117 100644 --- a/openucx.changes +++ b/openucx.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jun 13 12:45:34 UTC 2018 - nmoreychaisemartin@suse.com + +- Remove libnuma-devel on s390x for older releases + ------------------------------------------------------------------- Tue Mar 27 07:12:37 UTC 2018 - nmoreychaisemartin@suse.com diff --git a/openucx.spec b/openucx.spec index 32a5053..24e3c11 100644 --- a/openucx.spec +++ b/openucx.spec @@ -34,7 +34,13 @@ BuildRequires: automake >= 1.10 BuildRequires: binutils-devel BuildRequires: gcc-c++ BuildRequires: libibverbs-devel +%if 0%{?suse_version} < 1330 +%ifnarch s390x BuildRequires: libnuma-devel +%endif +%else +BuildRequires: libnuma-devel +%endif BuildRequires: libtool BuildRequires: pkg-config BuildRequires: zlib-devel @@ -139,7 +145,14 @@ export UCX_CFLAGS="$UCX_CFLAGS -mno-avx" %ifarch %ix86 export UCX_CFLAGS="$UCX_CFLAGS -mno-sse -mno-sse2" %endif -%configure --disable-static --without-avx --docdir="%_docdir/%name" +%configure --disable-static --without-avx \ +%if 0%{?suse_version} < 1330 +%ifarch s390x + --disable-numa \ +%endif +%endif + --docdir="%_docdir/%name" + make %{?_smp_mflags} V=1 %post -n libucp0 -p /sbin/ldconfig