diff --git a/scotch-Makefile.shared.inc.in b/scotch-Makefile.shared.inc.in index f56ee16..aa856b4 100644 --- a/scotch-Makefile.shared.inc.in +++ b/scotch-Makefile.shared.inc.in @@ -9,7 +9,7 @@ CCS = gcc CCP = mpicc CCD = mpicc override CFLAGS += -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_FILE_COMPRESS_BZ2 -DCOMMON_FILE_COMPRESS_LZMA \ - -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_PTHREAD \ + -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME \ -Drestrict=__restrict -DIDXSIZE64 CLIBFLAGS = -shared -fPIC override LDFLAGS += -lz -lbz2 -llzmadec -lm -lrt -lpthread diff --git a/scotch.spec b/scotch.spec index f824d73..c863b9c 100644 --- a/scotch.spec +++ b/scotch.spec @@ -10,7 +10,7 @@ Name: scotch Summary: Graph, mesh and hypergraph partitioning library Version: 6.0.4 -Release: 12%{?dist} +Release: 13%{?dist} License: CeCILL-C URL: https://gforge.inria.fr/projects/scotch/ @@ -130,18 +130,18 @@ cp -a . %{mpichdir} %build pushd src/ -make %{?_smp_mflags} scotch esmumps CFLAGS="%{optflags}" LDFLAGS="%{?__global_ldflags}" SOMAJ="%{so_maj}" +%make_build scotch esmumps CFLAGS="%{optflags}" LDFLAGS="%{?__global_ldflags}" SOMAJ="%{so_maj}" popd %{_mpich_load} pushd %{mpichdir}/src/ -make %{?_smp_mflags} ptscotch ptesmumps CFLAGS="%{optflags}" LDFLAGS="%{?__global_ldflags}" SOMAJ="%{so_maj}" +%make_build ptscotch ptesmumps CFLAGS="%{optflags}" LDFLAGS="%{?__global_ldflags}" SOMAJ="%{so_maj}" popd %{_mpich_unload} %{_openmpi_load} pushd %{openmpidir}/src/ -make %{?_smp_mflags} ptscotch ptesmumps CFLAGS="%{optflags}" LDFLAGS="%{?__global_ldflags}" SOMAJ="%{so_maj}" +%make_build ptscotch ptesmumps CFLAGS="%{optflags}" LDFLAGS="%{?__global_ldflags}" SOMAJ="%{so_maj}" popd %{_openmpi_unload} @@ -277,6 +277,9 @@ popd %doc doc/scotch_example.f %changelog +* Thu Oct 27 2016 Sandro Mani - 6.0.4-13 +- Drop -DSCOTCH_PTHREAD (#1386707) + * Mon Oct 24 2016 Dan HorĂ¡k - 6.0.4-12 - drop ExcludeArch