diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..88b2753 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/scotch_6.0.5.tar.gz diff --git a/EMPTY b/EMPTY deleted file mode 100644 index 0519ecb..0000000 --- a/EMPTY +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/scotch-Makefile.shared.inc.in b/scotch-Makefile.shared.inc.in new file mode 100644 index 0000000..c7978ce --- /dev/null +++ b/scotch-Makefile.shared.inc.in @@ -0,0 +1,24 @@ +EXE = +LIB = .so +OBJ = .o + +MAKE = make +AR = gcc +CAT = cat +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 \ + -Drestrict=__restrict -DIDXSIZE64 +CLIBFLAGS = -shared -fPIC +override LDFLAGS += -lz -lbz2 -llzmadec -lm -lrt -lpthread +# LDFLAGS added to AR rule in Makefiles to come after objects to work with -Wl,--as-needed +ARFLAGS = -shared -Wl,-soname=$@.$(SOMAJ) -o +CP = cp -av +LEX = flex +LN = ln +MKDIR = mkdir -p +MV = mv +RANLIB = echo +YACC = bison -y diff --git a/scotch-ldflags.patch b/scotch-ldflags.patch new file mode 100644 index 0000000..3740d51 --- /dev/null +++ b/scotch-ldflags.patch @@ -0,0 +1,68 @@ +diff -urNp a/src/esmumps/Makefile b/src/esmumps/Makefile +--- a/src/esmumps/Makefile 2021-01-12 19:47:38.599350265 +0100 ++++ b/src/esmumps/Makefile 2021-01-12 19:52:21.913874810 +0100 +@@ -151,7 +151,7 @@ lib$(ESMUMPSLIB)$(LIB) : graph_graph$(O + esmumps$(OBJ) \ + esmumps_f$(OBJ) \ + esmumps_strats$(OBJ) +- $(AR) $(ARFLAGS) lib$(ESMUMPSLIB)$(LIB) $(?) ++ $(AR) $(ARFLAGS) lib$(ESMUMPSLIB)$(LIB) $(?) $(LDFLAGS) + -$(RANLIB) lib$(ESMUMPSLIB)$(LIB) + + main_esmumps$(EXE) : main_esmumps.c \ +diff -urNp a/src/libscotch/Makefile b/src/libscotch/Makefile +--- a/src/libscotch/Makefile 2021-01-12 19:47:38.602350292 +0100 ++++ b/src/libscotch/Makefile 2021-01-12 19:56:35.901101614 +0100 +@@ -2962,26 +2962,26 @@ ptscotchf.h : ptdummysizes$(EXE) \ + library_pt_f.h + ./ptdummysizes$(EXE) library_pt_f.h ptscotchf.h + +-libscotch$(LIB) : $(LIBSCOTCHDEPS) +- $(AR) $(ARFLAGS) $(@) $(?) ++libscotch$(LIB) : $(LIBSCOTCHDEPS) libscotcherr$(LIB) ++ $(AR) $(ARFLAGS) $(@) $(?) $(LDFLAGS) -L . -lscotcherr + -$(RANLIB) $(@) + + libscotcherr$(LIB) : library_error$(OBJ) +- $(AR) $(ARFLAGS) $(@) $(?) ++ $(AR) $(ARFLAGS) $(@) $(?) $(LDFLAGS) + -$(RANLIB) $(@) + + libscotcherrexit$(LIB) : library_error_exit$(OBJ) +- $(AR) $(ARFLAGS) $(@) $(?) ++ $(AR) $(ARFLAGS) $(@) $(?) $(LDFLAGS) + -$(RANLIB) $(@) + +-libptscotch$(LIB) : $(LIBPTSCOTCHDEPS) +- $(AR) $(ARFLAGS) $(@) $(?) ++libptscotch$(LIB) : $(LIBPTSCOTCHDEPS) libscotch$(LIB) ++ $(AR) $(ARFLAGS) $(@) $(?) $(LDFLAGS) + -$(RANLIB) $(@) + + libptscotcherr$(LIB) : library_error_pt$(OBJ) +- $(AR) $(ARFLAGS) $(@) $(?) ++ $(AR) $(ARFLAGS) $(@) $(?) $(LDFLAGS) + -$(RANLIB) $(@) + + libptscotcherrexit$(LIB) : library_error_exit_pt$(OBJ) +- $(AR) $(ARFLAGS) $(@) $(?) ++ $(AR) $(ARFLAGS) $(@) $(?) $(LDFLAGS) + -$(RANLIB) $(@) +diff -urNp a/src/libscotchmetis/Makefile b/src/libscotchmetis/Makefile +--- a/src/libscotchmetis/Makefile 2021-01-12 19:47:38.599350265 +0100 ++++ b/src/libscotchmetis/Makefile 2021-01-12 19:58:40.718189527 +0100 +@@ -129,12 +129,12 @@ libptscotchparmetis$(LIB) : parmetis_dgr + parmetis_dgraph_order_f$(OBJ) \ + parmetis_dgraph_part$(OBJ) \ + parmetis_dgraph_part_f$(OBJ) +- $(AR) $(ARFLAGS) $(@) $(^) ++ $(AR) $(ARFLAGS) $(@) $(^) $(LDFLAGS) -L ../libscotch -lptscotch + -$(RANLIB) $(@) + + libscotchmetis$(LIB) : metis_graph_order$(OBJ) \ + metis_graph_order_f$(OBJ) \ + metis_graph_part$(OBJ) \ + metis_graph_part_f$(OBJ) +- $(AR) $(ARFLAGS) $(@) $(^) ++ $(AR) $(ARFLAGS) $(@) $(^) $(LDFLAGS) -L ../libscotch -lscotch + -$(RANLIB) $(@) diff --git a/scotch.h b/scotch.h new file mode 100644 index 0000000..a7ed34c --- /dev/null +++ b/scotch.h @@ -0,0 +1,10 @@ +#include + +#if __WORDSIZE == 32 +#include "scotch-32.h" +#elif __WORDSIZE == 64 +#include "scotch-64.h" +#else +#error "Unknown word size" +#endif + diff --git a/scotch.spec b/scotch.spec new file mode 100644 index 0000000..0f502f2 --- /dev/null +++ b/scotch.spec @@ -0,0 +1,463 @@ +%global openmpidir %{_builddir}/ptscotch-openmpi-%{version}-%{release} +%global mpichdir %{_builddir}/ptscotch-mpich-%{version}-%{release} + +# Shared library versioning: +# Increment if interface is changed in an incompatible way +%global so_maj 0 +# Increment if interface is extended +%global so_min 2 + +Name: scotch +Summary: Graph, mesh and hypergraph partitioning library +Version: 6.0.5 +Release: 3%{?dist} + +License: CeCILL-C +URL: https://gforge.inria.fr/projects/scotch/ +Source0: https://gforge.inria.fr/frs/download.php/file/34618/%{name}_%{version}.tar.gz +Source1: scotch-Makefile.shared.inc.in +Source2: scotch.h +Source3: scotchf.h + +# Makefile fixes for building esmumps +Patch0: scotch_esmumps.patch + +# LD flags fix +Patch1: scotch-ldflags.patch + +BuildRequires: flex +BuildRequires: bison +BuildRequires: zlib-devel +BuildRequires: bzip2-devel +%if 0%{?fedora} +BuildRequires: lzma-devel +%endif + +%description +Scotch is a software package for graph and mesh/hypergraph partitioning and +sparse matrix ordering. The parallel scotch libraries are packaged in the +ptscotch sub-packages. + +%package devel +Summary: Development libraries for scotch +Requires: %{name}%{?_isa} = %{version}-%{release} +Obsoletes: %{name}-static < 6.0.0-8 + +%description devel +This package contains development libraries for scotch. + + +%package doc +Summary: Documentations and example for scotch and ptscotch +BuildArch: noarch + +%description doc +Contains documentations and example for scotch and ptscotch + +############################################################################### + +%package -n ptscotch-mpich +Summary: PT-Scotch libraries compiled against mpich +BuildRequires: mpich-devel + +%description -n ptscotch-mpich +Scotch is a software package for graph and mesh/hypergraph partitioning and +sparse matrix ordering. This sub-package provides parallelized scotch libraries +compiled with mpich. + + +%package -n ptscotch-mpich-devel +Summary: Development libraries for PT-Scotch (mpich) +Requires: pt%{name}-mpich%{?_isa} = %{version}-%{release} +Obsoletes: ptscotch-mpich-static < 6.0.0-8 + +%description -n ptscotch-mpich-devel +This package contains development libraries for PT-Scotch, compiled against +mpich. + +%package -n ptscotch-mpich-devel-parmetis +Summary: Parmetis compatibility header for scotch +Requires: pt%{name}-mpich-devel%{?_isa} = %{version}-%{release} + +%description -n ptscotch-mpich-devel-parmetis +This package contains the parmetis compatibility header for scotch. + + +############################################################################### + +%package -n ptscotch-openmpi +Summary: PT-Scotch libraries compiled against openmpi +BuildRequires: openmpi-devel + +%description -n ptscotch-openmpi +Scotch is a software package for graph and mesh/hypergraph partitioning and +sparse matrix ordering. This sub-package provides parallelized scotch libraries +compiled with openmpi. + + +%package -n ptscotch-openmpi-devel +Summary: Development libraries for PT-Scotch (openmpi) +Requires: pt%{name}-openmpi%{?_isa} = %{version}-%{release} +Obsoletes: ptscotch-openmpi-static < 6.0.0-8 + +%description -n ptscotch-openmpi-devel +This package contains development libraries for PT-Scotch, compiled against +openmpi. + + +%package -n ptscotch-openmpi-devel-parmetis +Summary: Parmetis compatibility header for scotch +Requires: pt%{name}-openmpi-devel%{?_isa} = %{version}-%{release} + +%description -n ptscotch-openmpi-devel-parmetis +This package contains the parmetis compatibility header for scotch. + +############################################################################### + +%prep +# Sigh, they forgot to update the version in the folder name +%setup -q -n scotch_6.0.4 +%patch0 -p1 +%patch1 -p1 + +cp -a %{SOURCE1} src/Makefile.inc + +# Convert the license files to utf8 +for file in doc/CeCILL-C_V1-en.txt doc/CeCILL-C_V1-fr.txt; do + iconv -f iso8859-1 -t utf-8 $file > $file.conv && mv -f $file.conv $file +done + +# No lzma-devel in el +%if 0%{?rhel} +sed -i -e s/-llzmadec// -e s/-DCOMMON_FILE_COMPRESS_LZMA// src/Makefile.inc +%endif + +cp -a . %{openmpidir} +cp -a . %{mpichdir} + + +%build +pushd src/ +%make_build scotch esmumps CFLAGS="%{optflags}" LDFLAGS="%{?__global_ldflags}" SOMAJ="%{so_maj}" +popd + +%{_mpich_load} +pushd %{mpichdir}/src/ +%make_build ptscotch ptesmumps CFLAGS="%{optflags}" LDFLAGS="%{?__global_ldflags} -L%{_libdir}/mpich/lib -lmpi" SOMAJ="%{so_maj}" +popd +%{_mpich_unload} + +%{_openmpi_load} +pushd %{openmpidir}/src/ +%make_build ptscotch ptesmumps CFLAGS="%{optflags}" LDFLAGS="%{?__global_ldflags} -L%{_libdir}/openmpi/lib -lmpi" SOMAJ="%{so_maj}" +popd +%{_openmpi_unload} + + +%install +%define doinstall() \ +make install prefix=%{buildroot}${MPI_HOME} libdir=%{buildroot}${MPI_LIB} includedir=%{buildroot}${MPI_INCLUDE} mandir=%{buildroot}${MPI_MAN} bindir=%{buildroot}${MPI_BIN} \ +# Fix debuginfo packages not finding sources (See libscotch/Makefile) \ +ln -s parser_ll.c libscotch/lex.yy.c \ +ln -s parser_yy.c libscotch/y.tab.c \ +ln -s parser_ly.h libscotch/y.tab.h \ +\ +pushd %{buildroot}${MPI_LIB}; \ +for lib in *.so; do \ + chmod 755 $lib \ + mv $lib $lib.%{so_maj}.%{so_min} && ln -s $lib.%{so_maj}.%{so_min} $lib && ln -s $lib.%{so_maj}.%{so_min} $lib.%{so_maj} \ +done \ +popd \ +\ +pushd %{buildroot}${MPI_BIN} \ +for prog in *; do \ + mv $prog scotch_${prog} \ + chmod 755 scotch_$prog \ +done \ +popd \ +\ +pushd %{buildroot}${MPI_MAN}/man1/ \ +for man in *; do \ + mv ${man} scotch_${man} \ +done \ +# Cleanup man pages (some pages are only relevant for ptscotch packages, and vice versa) \ +for man in *; do \ + if [ ! -f %{buildroot}${MPI_BIN}/${man/.1/} ]; then \ + rm -f $man \ + fi \ +done \ +popd + +############################################################################### + +export MPI_HOME=%{_prefix} +export MPI_LIB=%{_libdir} +export MPI_INCLUDE=%{_includedir} +export MPI_MAN=%{_mandir} +export MPI_BIN=%{_bindir} +pushd src +%doinstall +popd + +############################################################################### + +%{_mpich_load} +pushd %{mpichdir}/src +%doinstall +install -m644 libscotchmetis/parmetis.h %{buildroot}${MPI_INCLUDE} +popd +%{_mpich_unload} + +############################################################################### + +%{_openmpi_load} +pushd %{openmpidir}/src +%doinstall +install -m644 libscotchmetis/parmetis.h %{buildroot}${MPI_INCLUDE} +popd +%{_openmpi_unload} + +############################################################################### +# Fix multilibs header conflict +%ifarch x86_64 i686 +%ifarch x86_64 +mv %{buildroot}%{_includedir}/scotch.h \ + %{buildroot}%{_includedir}/scotch-64.h +mv %{buildroot}%{_includedir}/scotchf.h \ + %{buildroot}%{_includedir}/scotchf-64.h +%else +mv %{buildroot}%{_includedir}/scotch.h \ + %{buildroot}%{_includedir}/scotch-32.h +mv %{buildroot}%{_includedir}/scotchf.h \ + %{buildroot}%{_includedir}/scotchf-32.h +%endif +install -pm 0644 %{SOURCE2} %{buildroot}%{_includedir}/scotch.h +install -pm 0644 %{SOURCE3} %{buildroot}%{_includedir}/scotchf.h +%endif + + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%post -n ptscotch-mpich -p /sbin/ldconfig + +%postun -n ptscotch-mpich -p /sbin/ldconfig + +%post -n ptscotch-openmpi -p /sbin/ldconfig + +%postun -n ptscotch-openmpi -p /sbin/ldconfig + + +%{!?_licensedir:%global license %%doc} +%files +%license doc/CeCILL-C_V1-en.txt +%{_bindir}/* +%{_libdir}/libscotch*.so.0* +%{_libdir}/libesmumps*.so.0* +%{_mandir}/man1/* + +%files devel +%{_libdir}/libscotch*.so +%{_libdir}/libesmumps*.so +%{_includedir}/*scotch*.h +%{_includedir}/*esmumps*.h + +%files -n ptscotch-mpich +%license doc/CeCILL-C_V1-en.txt +%{_libdir}/mpich/lib/lib*scotch*.so.0* +%{_libdir}/mpich/lib/lib*esmumps*.so.0* +%{_libdir}/mpich/bin/* +%{_mandir}/mpich*/* + +%files -n ptscotch-mpich-devel +%{_includedir}/mpich*/*scotch*.h +%{_includedir}/mpich*/*esmumps*.h +%{_libdir}/mpich/lib/lib*scotch*.so +%{_libdir}/mpich/lib/lib*esmumps*.so + +%files -n ptscotch-mpich-devel-parmetis +%{_includedir}/mpich*/parmetis.h + +%files -n ptscotch-openmpi +%license doc/CeCILL-C_V1-en.txt +%{_libdir}/openmpi/lib/lib*scotch*.so.0* +%{_libdir}/openmpi/lib/lib*esmumps*.so.0* +%{_libdir}/openmpi/bin/* +%{_mandir}/openmpi*/* + +%files -n ptscotch-openmpi-devel +%{_includedir}/openmpi*/*scotch*.h +%{_includedir}/openmpi*/*esmumps*.h +%{_libdir}/openmpi/lib/lib*scotch*.so +%{_libdir}/openmpi/lib/lib*esmumps*.so + +%files -n ptscotch-openmpi-devel-parmetis +%{_includedir}/openmpi*/parmetis.h + +%files doc +%license doc/CeCILL-C_V1-en.txt +%doc doc/*.pdf +%doc doc/scotch_example.f + +%changelog +* Wed Jan 13 2021 Josef Ridky - 6.0.5-3 +- add gating.yaml + +* Tue Jan 12 2021 Josef Ridky - 6.0.5-2 +- fix library linking and multilib issue (#1853163) + +* Mon Feb 12 2018 Sandro Mani - 6.0.5-1 +- Update to 6.0.5 + +* Fri Feb 09 2018 Fedora Release Engineering - 6.0.4-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 6.0.4-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 6.0.4-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 6.0.4-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* 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 + +* Fri Oct 21 2016 Orion Poplawski - 6.0.4-11 +- Rebuild for openmpi 2.0 + +* Thu Feb 04 2016 Fedora Release Engineering - 6.0.4-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jan 22 2016 Sandro Mani - 6.0.4-9 +- Install parmetis.h in separate package + +* Tue Dec 01 2015 Than Ngo - 6.0.4-8 +- ExcludeArch: s390 s390x + +* Thu Nov 26 2015 Dave Love - 6.0.4-7 +- Install parmetis.h +- Conditionalize %%license and %%__global_ldflags + +* Tue Sep 15 2015 Orion Poplawski - 6.0.4-6 +- Rebuild for openmpi 1.10.0 + +* Sat Aug 15 2015 Zbigniew Jędrzejewski-Szmek - 6.0.4-5 +- Rebuild for MPI provides + +* Sun Jul 26 2015 Sandro Mani - 6.0.4-4 +- Rebuild for RPM MPI Requires Provides Change + +* Fri Jun 19 2015 Fedora Release Engineering - 6.0.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sun May 3 2015 Zbigniew Jędrzejewski-Szmek - 6.0.4-2 +- Rebuild for changed mpich + +* Sat Mar 14 2015 Sandro Mani - 6.0.4-1 +- Update to 6.0.4 + +* Thu Mar 12 2015 Sandro Mani - 6.0.3-4 +- Rebuild (mpich) + +* Mon Dec 01 2014 Sandro Mani - 6.0.3-2 +- Build esmumps + +* Wed Nov 05 2014 Sandro Mani - 6.0.3-1 +- Update to 6.0.3 + +* Mon Sep 22 2014 Sandro Mani - 6.0.1-1 +- Update to 6.0.1 + +* Mon Aug 18 2014 Fedora Release Engineering - 6.0.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Fri Aug 08 2014 Sandro Mani - 6.0.0-8 +- Rework specfile + +* Sat Jul 05 2014 Sandro Mani - 6.0.0-7 +- Fix under-linked libraries (#1098680) + +* Sun Jun 08 2014 Fedora Release Engineering - 6.0.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu Feb 27 2014 Deji Akingunola - 6.0.0-5 +- Slightly modified Erik Zeek spec re-write (See 2012-10-08 below) +- Rename mpich and openmpi subpackages as ptscotch-(mpich/openmpi) (Laurence Mcglashan) + +* Mon Feb 24 2014 Deji Akingunola - 6.0.0-4 +- Rebuild for mpich-3.1 + +* Sun Aug 04 2013 Fedora Release Engineering - 6.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Sun Jul 21 2013 Deji Akingunola - 6.0.0-2 +- Rename mpich2 sub-packages to mpich and rebuild for mpich-3.0 + +* Thu Jun 13 2013 Deji Akingunola - 6.0.0-1 +- Update to 6.0.0 +- Configured to run with 2 threads (for now) +- Install the headers in arch-dependent sub-directories + +* Thu Feb 14 2013 Fedora Release Engineering - 5.1.12-2.b +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sat Nov 17 2012 Deji Akingunola - 5.1.12-1.b +- Update to 5.1.12b + +* Mon Oct 08 2012 Erik Zeek - 5.1.11-4 +- Use internal build machinery to build shared libraries. +- A bunch of MPI love. +- Install Mpich2 libraries in the proper path. +- Provide Mpich2 and OpenMPI libraries. + +* Sat Jul 21 2012 Fedora Release Engineering - 5.1.11-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 5.1.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Mar 29 2011 Deji Akingunola - 5.1.11-1 +- Update to 5.1.11 + +* Wed Feb 09 2011 Fedora Release Engineering - 5.1.10b-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Oct 19 2010 Deji Akingunola - 5.1.10b-1 +- Update to 5.1.10b + +* Thu Aug 12 2010 Deji Akingunola - 5.1.9-1 +- Update to 5.1.9 +- No more static builds + +* Tue Apr 27 2010 Deji Akingunola - 5.1.8-1 +- Update to 5.1.8 + +* Wed Nov 04 2009 Deji Akingunola - 5.1.7-2 +- Fix the Source url + +* Sun Sep 20 2009 Deji Akingunola - 5.1.7-1 +- Update to 5.1.7 +- Put the library under libdir + +* Thu Jun 11 2009 Deji Akingunola - 5.1.6-3 +- Further spec fixes from package review (convert license files to utf8) +- Prefix binaries and their corresponding manpages with scotch_ . +- Link in appropriates libraries when creating shared libs + +* Thu Jun 04 2009 Deji Akingunola - 5.1.6-2 +- Add zlib-devel as BR + +* Wed May 13 2009 Deji Akingunola - 5.1.6-1 +- Update to 5.1.6 + +* Fri Nov 21 2008 Deji Akingunola - 5.1.2-1 +- Update to 5.1.2 + +* Fri Sep 19 2008 Deji Akingunola - 5.1.1-1 +- initial package creation diff --git a/scotch_esmumps.patch b/scotch_esmumps.patch new file mode 100644 index 0000000..5231c5a --- /dev/null +++ b/scotch_esmumps.patch @@ -0,0 +1,33 @@ +diff -rupN scotch_6.0.4/src/esmumps/Makefile scotch_6.0.4-new/src/esmumps/Makefile +--- scotch_6.0.4/src/esmumps/Makefile 2015-03-14 00:32:06.000000000 +0100 ++++ scotch_6.0.4-new/src/esmumps/Makefile 2015-03-14 20:53:15.577908208 +0100 +@@ -59,7 +59,7 @@ scotch : clean + + ptscotch : clean + $(MAKE) CFLAGS="$(CFLAGS) -DSCOTCH_PTSCOTCH" CC="$(CCP)" SCOTCHLIB=ptscotch ESMUMPSLIB=ptesmumps \ +- libesmumps$(LIB) \ ++ libptesmumps$(LIB) \ + main_esmumps$(EXE) + + install : +@@ -142,7 +142,7 @@ esmumps_strats$(OBJ) : esmumps_strats.c + common.h \ + esmumps.h + +-libesmumps$(LIB) : graph_graph$(OBJ) \ ++lib$(ESMUMPSLIB)$(LIB) : graph_graph$(OBJ) \ + order$(OBJ) \ + order_scotch_graph$(OBJ) \ + dof$(OBJ) \ +diff -rupN scotch_6.0.4/src/Makefile scotch_6.0.4-new/src/Makefile +--- scotch_6.0.4/src/Makefile 2014-10-02 17:31:36.000000000 +0200 ++++ scotch_6.0.4-new/src/Makefile 2015-03-14 20:52:24.735897296 +0100 +@@ -116,6 +116,8 @@ install : required $(bindir) $(includ + -$(CP) -f ../bin/d[agm]*$(EXE) $(bindir) + -$(CP) -f ../include/*scotch*.h $(includedir) + -$(CP) -f ../lib/*scotch*$(LIB) $(libdir) ++ -$(CP) -f ../include/*esmumps*.h $(includedir) ++ -$(CP) -f ../lib/*esmumps*$(LIB) $(libdir) + -$(CP) -Rf ../man/* $(mandir) + + clean : required diff --git a/scotchf.h b/scotchf.h new file mode 100644 index 0000000..79117db --- /dev/null +++ b/scotchf.h @@ -0,0 +1,10 @@ +#include + +#if __WORDSIZE == 32 +#include "scotchf-32.h" +#elif __WORDSIZE == 64 +#include "scotchf-64.h" +#else +#error "Unknown word size" +#endif + diff --git a/sources b/sources new file mode 100644 index 0000000..3fa8a80 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (scotch_6.0.5.tar.gz) = 0fcf639ab1a09451256444005f1a4a739403159e3ab22c34fbcedc481be387cd4c86be6fb029b4b5816220564f64f662434bf7f1d3921ed18be081ae2a7a9ee2