From d64f3b66bbf26c85d379093882a7ff62599aca1d Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Oct 30 2017 15:49:23 +0000 Subject: Version bump to 17.10.0 --- diff --git a/.gitignore b/.gitignore index fcf3465..a00c1f1 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /legion*.src.rpm /legion-17.05.0.tar.gz /legion-17.08.0.tar.gz +/legion-17.10.0.tar.gz diff --git a/legion.spec b/legion.spec index 8a1791d..234fcfd 100644 --- a/legion.spec +++ b/legion.spec @@ -1,12 +1,10 @@ Name: legion -Version: 17.08.0 -Release: 3%{?dist} +Version: 17.10.0 +Release: 1%{?dist} Summary: A data-centric parallel programming system License: ASL 2.0 Url: http://legion.stanford.edu/ Source0: https://github.com/StanfordLegion/legion/archive/%{name}-%{version}.tar.gz#/%{name}-%{version}.tar.gz -#patch for s390x (bug #1477749) -Patch0: s390x.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -99,16 +97,13 @@ This package contains development headers and libraries for the legion library %prep %setup -q -n %{name}-%{name}-%{version} -%ifnarch s390x -%patch0 -p1 -%endif %build mkdir serial openmpi mpich pushd serial export LDFLAGS="%{__global_ldflags} -Wl,--as-needed" -%{cmake3} .. -DLegion_USE_HWLOC=ON -DLegion_USE_GASNet=OFF -DLegion_BUILD_EXAMPLES=ON -DLegion_BUILD_TESTS=ON -DLegion_BUILD_TUTORIAL=ON \ +%{cmake3} .. -DLegion_USE_HWLOC=ON -DLegion_USE_GASNet=OFF -DLegion_BUILD_EXAMPLES=ON \ -DLegion_BUILD_TESTS=ON -DLegion_BUILD_TUTORIAL=ON -DLegion_ENABLE_TESTING=ON %make_build popd @@ -116,8 +111,8 @@ popd pushd openmpi %{_openmpi_load} export LDFLAGS="%{__global_ldflags} -Wl,--as-needed" -%{cmake3} .. -DLegion_USE_HWLOC=ON -DLegion_USE_GASNet=ON -DLegion_BUILD_EXAMPLES=ON -DCMAKE_INSTALL_LIBDIR=${MPI_LIB} -DGASNet_CONDUIT=mpi \ - -DGASNet_mpi-par_LIBRARY=${MPI_LIB}/libgasnet-mpi-par.so -DGASNet_gasnet_tools-par_LIBRARY=$MPI_LIB/libgasnet_tools-par.so -DGASNet_INCLUDE_DIR=$MPI_INCLUDE \ +%{cmake3} .. -DLegion_USE_HWLOC=ON -DLegion_USE_GASNet=ON -DLegion_BUILD_EXAMPLES=ON \ + -DCMAKE_INSTALL_LIBDIR=${MPI_LIB} -DCMAKE_INSTALL_INCLUDEDIR=${MPI_INCLUDE} -DGASNet_CONDUIT=mpi \ -DLegion_BUILD_TESTS=ON -DLegion_BUILD_TUTORIAL=ON -DLegion_ENABLE_TESTING=ON %make_build %{_openmpi_unload} @@ -126,8 +121,8 @@ popd pushd mpich %{_mpich_load} export LDFLAGS="%{__global_ldflags} -Wl,--as-needed" -%{cmake3} .. -DLegion_USE_HWLOC=ON -DLegion_USE_GASNet=ON -DLegion_BUILD_EXAMPLES=ON -DCMAKE_INSTALL_LIBDIR=${MPI_LIB} -DGASNet_CONDUIT=mpi \ - -DGASNet_mpi-par_LIBRARY=${MPI_LIB}/libgasnet-mpi-par.so -DGASNet_gasnet_tools-par_LIBRARY=$MPI_LIB/libgasnet_tools-par.so -DGASNet_INCLUDE_DIR=$MPI_INCLUDE \ +%{cmake3} .. -DLegion_USE_HWLOC=ON -DLegion_USE_GASNet=ON -DLegion_BUILD_EXAMPLES=ON \ + -DCMAKE_INSTALL_LIBDIR=${MPI_LIB} -DCMAKE_INSTALL_INCLUDEDIR=${MPI_INCLUDE} -DGASNet_CONDUIT=mpi \ -DLegion_BUILD_TESTS=ON -DLegion_BUILD_TUTORIAL=ON -DLegion_ENABLE_TESTING=ON %make_build %{_mpich_unload} @@ -186,6 +181,9 @@ mv %{buildroot}{%{_datadir}/Legion,%{_libdir}/cmake/%{name}} %{_libdir}/mpich*/lib/lib*.so.1 %changelog +* Sat Oct 28 2017 Christoph Junghans - 17.10.0-1 +- Version bump to 17.10.0 + * Tue Oct 03 2017 Christoph Junghans - 17.08.0-3 - Rebuilt for gasnet-1.30.0 for fc27 diff --git a/s390x.patch b/s390x.patch deleted file mode 100644 index a776c8a..0000000 --- a/s390x.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- legion-legion-17.05.0/runtime/realm/numa/numasysif.cc 2017/06/15 14:00:13 1.1 -+++ legion-legion-17.05.0/runtime/realm/numa/numasysif.cc 2017/06/15 14:01:01 -@@ -27,10 +27,11 @@ - - #include - - #ifdef __linux__ - #include -+#include - #include - #include - #include - #include - #include diff --git a/sources b/sources index 766440b..0529e87 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (legion-17.08.0.tar.gz) = 5d97157f97e12149e5fdf3a75d2e6e8a41ebf97e09c35501e2c93437bd0a47643d261f68c6b4a83b47e64d706f35914acd3a852eb0c08a11696b05ba9ef7af87 +SHA512 (legion-17.10.0.tar.gz) = c4be9b32b47b3c4ae38374606125867f963a109dd542a52ee20b2964e5849121207d78947f0ab6ea4ed5e8a027b26da7b1a3a61124f175c1b9f7323e56b8d9b2