commit: 85f96e014d0e2355a2f3165fc04e035617fa68ea Author: Justin Lecher <jlec <AT> gentoo <DOT> org> AuthorDate: Mon Dec 18 19:27:03 2017 +0000 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> CommitDate: Mon Dec 18 19:40:17 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85f96e01
sci-libs/parmgridgen: Bump to EAPI=6 * fix format security * fix for new hash algos Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> Package-Manager: Portage-2.3.19, Repoman-2.3.6 sci-libs/parmgridgen/Manifest | 2 +- .../files/parmgridgen-1.0-as-needed.patch | 8 +- .../files/parmgridgen-1.0-autotools.patch | 406 +++++++++++++-------- .../files/parmgridgen-1.0-format-security.patch | 48 +++ .../files/parmgridgen-1.0-impl-fct.patch | 70 ++++ sci-libs/parmgridgen/parmgridgen-1.0-r1.ebuild | 50 +++ 6 files changed, 422 insertions(+), 162 deletions(-) diff --git a/sci-libs/parmgridgen/Manifest b/sci-libs/parmgridgen/Manifest index c24a0dfa23c..fb5fa0dc4aa 100644 --- a/sci-libs/parmgridgen/Manifest +++ b/sci-libs/parmgridgen/Manifest @@ -1 +1 @@ -DIST ParMGridGen-1.0.tar.gz 2623528 SHA256 62cdb6e48cfc59124e5d5d360c2841e0fc2feecafe65bda110b74e942740b395 SHA512 e12ea3c923dd900c92ba4f2639daacc6c3596c5ea3c8d366b269c4c21247b10e6400c384321cfc65b486e4f8217dcd43f43eee27570b1fe1375deb02e255cb16 WHIRLPOOL a78187a71e04d15b0260e411c713b190c36a68931442ff04e537f7efbbb01ddfdb58c09835ac341dc6d7f3826fc855f64e8b32ea24d41d40b77c438a57db207e +DIST ParMGridGen-1.0.tar.gz 2623528 BLAKE2B 982e6d7a0df3b9c101993ecf397c75f10d0cf390914ccca6f02efbe5ae190c65bc31e5770bd57ff375a8e3a3aab878c56da50af4f3e5f0f422044137d90ddff8 SHA512 e12ea3c923dd900c92ba4f2639daacc6c3596c5ea3c8d366b269c4c21247b10e6400c384321cfc65b486e4f8217dcd43f43eee27570b1fe1375deb02e255cb16 diff --git a/sci-libs/parmgridgen/files/parmgridgen-1.0-as-needed.patch b/sci-libs/parmgridgen/files/parmgridgen-1.0-as-needed.patch index 4f9addda422..3b378552fab 100644 --- a/sci-libs/parmgridgen/files/parmgridgen-1.0-as-needed.patch +++ b/sci-libs/parmgridgen/files/parmgridgen-1.0-as-needed.patch @@ -1,13 +1,13 @@ ---- MGridGen/Lib/Makefile.am.old 2009-03-10 09:28:13.000000000 +0200 -+++ MGridGen/Lib/Makefile.am 2009-03-10 09:28:07.000000000 +0200 +--- a/MGridGen/Lib/Makefile.am 2009-03-10 09:28:13.000000000 +0200 ++++ b/MGridGen/Lib/Makefile.am 2009-03-10 09:28:07.000000000 +0200 @@ -8,3 +8,5 @@ lib_LTLIBRARIES = libMGridGen.la libMGridGen_la_SOURCES = aratio.c coarsen.c kwayfm.c match.c merge.c mgridgen.c refine.c setup.c libMGridGen_la_LDFLAGS = -no-undefined -export-dynamic -version-info 1:0:0 + +libMGridGen_la_LIBADD = ../IMlib/libIMlib.la ---- ParMGridGen/ParLib/Makefile.am.old 2009-03-10 09:31:43.000000000 +0200 -+++ ParMGridGen/ParLib/Makefile.am 2009-03-10 09:35:13.000000000 +0200 +--- a/ParMGridGen/ParLib/Makefile.am 2009-03-10 09:31:43.000000000 +0200 ++++ b/ParMGridGen/ParLib/Makefile.am 2009-03-10 09:35:13.000000000 +0200 @@ -8,3 +8,8 @@ lib_LTLIBRARIES = libParMGridGen.la libParMGridGen_la_SOURCES = comm.c debug.c grsetup.c ikeysort.c memory.c move.c parmgridgen.c setup.c util.c diff --git a/sci-libs/parmgridgen/files/parmgridgen-1.0-autotools.patch b/sci-libs/parmgridgen/files/parmgridgen-1.0-autotools.patch index 5a5f2369a3a..1615f2232e5 100644 --- a/sci-libs/parmgridgen/files/parmgridgen-1.0-autotools.patch +++ b/sci-libs/parmgridgen/files/parmgridgen-1.0-autotools.patch @@ -1,23 +1,192 @@ ---- ParMGridGen-1.0-src/mgridgen.h 2001-11-09 00:41:22.000000000 +0100 -+++ ParMGridGen-1.0/mgridgen.h 1970-01-01 01:00:00.000000000 +0100 -@@ -1,7 +0,0 @@ --typedef int idxtype; --typedef double realtype; -- -- --void MGridGen(int, idxtype *, realtype *, realtype *, idxtype *, realtype *, -- int, int, int *, int *, int *, idxtype *); -- ---- ParMGridGen-1.0-src/parmgridgen.h 2001-12-06 00:05:37.000000000 +0100 -+++ ParMGridGen-1.0/parmgridgen.h 1970-01-01 01:00:00.000000000 +0100 -@@ -1,5 +0,0 @@ --typedef int idxtype; --typedef double realtype; -- --void ParMGridGen(idxtype *, idxtype *, realtype *, realtype *, idxtype *, -- realtype *, int *, int, int, int *, idxtype *, MPI_Comm *); ---- ParMGridGen-1.0-src/acx_mpi.m4 1970-01-01 01:00:00.000000000 +0100 -+++ ParMGridGen-1.0/acx_mpi.m4 2008-07-19 22:10:53.000000000 +0200 +From bbed136f01cd384bc4083aaca1761be9ee2d2a79 Mon Sep 17 00:00:00 2001 +From: Justin Lecher <j...@gentoo.org> +Date: Mon, 18 Dec 2017 18:30:09 +0000 +Subject: [PATCH] autotools support + +Signed-off-by: Justin Lecher <j...@gentoo.org> +--- + MGridGen/IMlib/Makefile.am | 8 + + MGridGen/Lib/Makefile.am | 10 ++ + MGridGen/Makefile.am | 4 + + MGridGen/Programs/Makefile.am | 7 + + Makefile.am | 7 + + ParMGridGen/IMParMetis-2.0/Makefile.am | 4 + + ParMGridGen/IMParMetis-2.0/ParMETISLib/Makefile.am | 8 + + ParMGridGen/Makefile.am | 4 + + ParMGridGen/ParLib/Makefile.am | 10 ++ + ParMGridGen/Programs/Makefile.am | 21 +++ + acx_mpi.m4 | 181 +++++++++++++++++++++ + configure.ac | 24 +++ + mgridgen.h | 7 - + mgridgen.pc.in | 10 ++ + parmgridgen.h | 5 - + parmgridgen.pc.in | 10 ++ + 16 files changed, 308 insertions(+), 12 deletions(-) + create mode 100644 MGridGen/IMlib/Makefile.am + create mode 100644 MGridGen/Lib/Makefile.am + create mode 100644 MGridGen/Makefile.am + create mode 100644 MGridGen/Programs/Makefile.am + create mode 100644 Makefile.am + create mode 100644 ParMGridGen/IMParMetis-2.0/Makefile.am + create mode 100644 ParMGridGen/IMParMetis-2.0/ParMETISLib/Makefile.am + create mode 100644 ParMGridGen/Makefile.am + create mode 100644 ParMGridGen/ParLib/Makefile.am + create mode 100644 ParMGridGen/Programs/Makefile.am + create mode 100644 acx_mpi.m4 + create mode 100644 configure.ac + delete mode 100644 mgridgen.h + create mode 100644 mgridgen.pc.in + delete mode 100644 parmgridgen.h + create mode 100644 parmgridgen.pc.in + +diff --git a/MGridGen/IMlib/Makefile.am b/MGridGen/IMlib/Makefile.am +new file mode 100644 +index 0000000..008c259 +--- /dev/null ++++ b/MGridGen/IMlib/Makefile.am +@@ -0,0 +1,8 @@ ++## Source directory ++ ++pkginclude_HEADERS = IMlib.h ++pkgincludedir = $(includedir)/mgridgen ++ ++lib_LTLIBRARIES = libIMlib.la ++libIMlib_la_SOURCES = blas.c dfkeysort.c dkeysort.c file.c ifkeysort.c ifloatsort.c iintsort.c ikeysort.c memory.c sort.c util.c ++libIMlib_la_LDFLAGS = -no-undefined -export-dynamic -version-info 1:0:0 +diff --git a/MGridGen/Lib/Makefile.am b/MGridGen/Lib/Makefile.am +new file mode 100644 +index 0000000..39946b0 +--- /dev/null ++++ b/MGridGen/Lib/Makefile.am +@@ -0,0 +1,10 @@ ++## Source directory ++ ++INCLUDES = -I../IMlib ++ ++pkginclude_HEADERS = defs.h macros.h mgridgen.h proto.h struct.h ++pkgincludedir = $(includedir)/mgridgen ++ ++lib_LTLIBRARIES = libMGridGen.la ++libMGridGen_la_SOURCES = aratio.c coarsen.c kwayfm.c match.c merge.c mgridgen.c refine.c setup.c ++libMGridGen_la_LDFLAGS = -no-undefined -export-dynamic -version-info 1:0:0 +diff --git a/MGridGen/Makefile.am b/MGridGen/Makefile.am +new file mode 100644 +index 0000000..040d716 +--- /dev/null ++++ b/MGridGen/Makefile.am +@@ -0,0 +1,4 @@ ++## middle directory ++ ++#Build in these directories: ++SUBDIRS= IMlib Lib Programs +diff --git a/MGridGen/Programs/Makefile.am b/MGridGen/Programs/Makefile.am +new file mode 100644 +index 0000000..3fe9ba5 +--- /dev/null ++++ b/MGridGen/Programs/Makefile.am +@@ -0,0 +1,7 @@ ++## Source directory ++ ++INCLUDES = -I../IMlib -I../Lib ++ ++bin_PROGRAMS = mgridgen ++mgridgen_SOURCES = io.c mgridgen.c ++mgridgen_LDADD = ../IMlib/libIMlib.la ../Lib/libMGridGen.la -lm +diff --git a/Makefile.am b/Makefile.am +new file mode 100644 +index 0000000..f97504c +--- /dev/null ++++ b/Makefile.am +@@ -0,0 +1,7 @@ ++## top directory ++ ++SUBDIRS = MGridGen ParMGridGen ++EXTRA_DIST = VERSION mgridgen.pc.in parmgridgen.pc.in ++ ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = mgridgen.pc parmgridgen.pc +diff --git a/ParMGridGen/IMParMetis-2.0/Makefile.am b/ParMGridGen/IMParMetis-2.0/Makefile.am +new file mode 100644 +index 0000000..3fa93db +--- /dev/null ++++ b/ParMGridGen/IMParMetis-2.0/Makefile.am +@@ -0,0 +1,4 @@ ++## middle directory ++ ++#Build in these directories: ++SUBDIRS= ParMETISLib +diff --git a/ParMGridGen/IMParMetis-2.0/ParMETISLib/Makefile.am b/ParMGridGen/IMParMetis-2.0/ParMETISLib/Makefile.am +new file mode 100644 +index 0000000..c4d6e33 +--- /dev/null ++++ b/ParMGridGen/IMParMetis-2.0/ParMETISLib/Makefile.am +@@ -0,0 +1,8 @@ ++## Source directory ++ ++pkginclude_HEADERS = defs.h macros.h parmetis.h proto.h rename.h struct.h ++pkgincludedir = $(includedir)/imparmetis ++ ++lib_LTLIBRARIES = libIMparmetis.la ++libIMparmetis_la_SOURCES = coarsen.c comm.c debug.c diffuse.c drivers.c edge_refine.c fused.c grsetup.c iidxsort.c ikeysort.c memory.c remap.c setup.c timer.c util.c var.c ++libIMparmetis_la_LDFLAGS = -no-undefined -export-dynamic -version-info 1:0:0 +diff --git a/ParMGridGen/Makefile.am b/ParMGridGen/Makefile.am +new file mode 100644 +index 0000000..0743f65 +--- /dev/null ++++ b/ParMGridGen/Makefile.am +@@ -0,0 +1,4 @@ ++## middle directory ++ ++#Build in these directories: ++SUBDIRS= IMParMetis-2.0 ParLib Programs +diff --git a/ParMGridGen/ParLib/Makefile.am b/ParMGridGen/ParLib/Makefile.am +new file mode 100644 +index 0000000..78d03d9 +--- /dev/null ++++ b/ParMGridGen/ParLib/Makefile.am +@@ -0,0 +1,10 @@ ++## Source directory ++ ++INCLUDES = -I$(top_builddir)/MGridGen/IMlib ++ ++pkginclude_HEADERS = defs.h macros.h parmgridgen.h proto.h rename.h struct.h ++pkgincludedir = $(includedir)/parmgridgen ++ ++lib_LTLIBRARIES = libParMGridGen.la ++libParMGridGen_la_SOURCES = comm.c debug.c grsetup.c ikeysort.c memory.c move.c parmgridgen.c setup.c util.c ++libParMGridGen_la_LDFLAGS = -no-undefined -export-dynamic -version-info 1:0:0 +diff --git a/ParMGridGen/Programs/Makefile.am b/ParMGridGen/Programs/Makefile.am +new file mode 100644 +index 0000000..0d586ee +--- /dev/null ++++ b/ParMGridGen/Programs/Makefile.am +@@ -0,0 +1,21 @@ ++## Source directory ++ ++INCLUDES = -I../ParLib -I$(top_builddir)/MGridGen/IMlib ++ ++bin_PROGRAMS = parmgridgen ++parmgridgen_SOURCES = io.c main.c parmgridgen.c ++parmgridgen_LDADD = ../IMParMetis-2.0/ParMETISLib/libIMparmetis.la ../ParLib/libParMGridGen.la \ ++ $(top_builddir)/MGridGen/IMlib/libIMlib.la $(top_builddir)/MGridGen/Lib/libMGridGen.la @MPILIBS@ ++ ++# AM_CPPFLAGS = -I$(top_srcdir)/ParMETISLib ++# LDADD = $(top_builddir)/METISLib/libmetis.la \ ++# $(top_builddir)/ParMETISLib/libparmetis.la ++ ++# check_PROGRAMS = parmgridgen ++# parmgridgen_SOURCES = io.c main.c parmgridgen.c ++ ++MPIRUN = mpirun -np 4 ++ ++check-local: $(check_PROGRAMS) ++ $(MPIRUN) parmgridgen $(top_builddir)/Graphs/M6.metis 3 4 6 1 4 128 ++ +diff --git a/acx_mpi.m4 b/acx_mpi.m4 +new file mode 100644 +index 0000000..bb2cb31 +--- /dev/null ++++ b/acx_mpi.m4 @@ -0,0 +1,181 @@ +# =========================================================================== +# http://autoconf-archive.cryp.to/acx_mpi.html @@ -200,34 +369,11 @@ + : +fi +])dnl ACX_MPI ---- ParMGridGen-1.0-src/mgridgen.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ ParMGridGen-1.0/mgridgen.pc.in 2008-07-20 15:34:06.000000000 +0200 -@@ -0,0 +1,10 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: MGridGen -+Description: Software for generating coarse grids -+Version: @VERSION@ -+Libs: -L${libdir} -lIMlib -lMGridGen -+Cflags: -I${includedir}/mgridgen ---- ParMGridGen-1.0-src/parmgridgen.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ ParMGridGen-1.0/parmgridgen.pc.in 2008-07-20 15:49:53.000000000 +0200 -@@ -0,0 +1,10 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: ParMGridGen -+Description: Software for parallel (mpi) generating coarse grids -+Version: @VERSION@ -+Libs: -L${libdir} -lIMparmetis -lParMGridGen -+Cflags: -I${includedir}/imparmetis -I${includedir}/parmgridgen ---- ParMGridGen-1.0-src/configure.ac 1970-01-01 01:00:00.000000000 +0100 -+++ ParMGridGen-1.0/configure.ac 2008-07-20 16:05:45.000000000 +0200 +diff --git a/configure.ac b/configure.ac +new file mode 100644 +index 0000000..daff95e +--- /dev/null ++++ b/configure.ac @@ -0,0 +1,24 @@ +# -*- Autoconf -*- +AC_PREREQ(2.61) @@ -253,116 +399,62 @@ + ParMGridGen/ParLib/Makefile + ParMGridGen/Programs/Makefile]) +AC_OUTPUT ---- ParMGridGen-1.0-src/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ ParMGridGen-1.0/Makefile.am 2008-07-20 15:55:52.000000000 +0200 -@@ -0,0 +1,7 @@ -+## top directory -+ -+SUBDIRS = MGridGen ParMGridGen -+EXTRA_DIST = VERSION mgridgen.pc.in parmgridgen.pc.in -+ -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA = mgridgen.pc parmgridgen.pc ---- ParMGridGen-1.0-src/MGridGen/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ ParMGridGen-1.0/MGridGen/Makefile.am 2008-07-19 22:53:47.000000000 +0200 -@@ -0,0 +1,4 @@ -+## middle directory -+ -+#Build in these directories: -+SUBDIRS= IMlib Lib Programs ---- ParMGridGen-1.0-src/MGridGen/IMlib/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ ParMGridGen-1.0/MGridGen/IMlib/Makefile.am 2008-07-19 22:48:10.000000000 +0200 -@@ -0,0 +1,8 @@ -+## Source directory -+ -+pkginclude_HEADERS = IMlib.h -+pkgincludedir = $(includedir)/mgridgen -+ -+lib_LTLIBRARIES = libIMlib.la -+libIMlib_la_SOURCES = blas.c dfkeysort.c dkeysort.c file.c ifkeysort.c ifloatsort.c iintsort.c ikeysort.c memory.c sort.c util.c -+libIMlib_la_LDFLAGS = -no-undefined -export-dynamic -version-info 1:0:0 ---- ParMGridGen-1.0-src/MGridGen/Lib/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ ParMGridGen-1.0/MGridGen/Lib/Makefile.am 2008-07-19 22:43:36.000000000 +0200 +diff --git a/mgridgen.h b/mgridgen.h +deleted file mode 100644 +index e1bfa2e..0000000 +--- a/mgridgen.h ++++ /dev/null +@@ -1,7 +0,0 @@ +-typedef int idxtype; +-typedef double realtype; +- +- +-void MGridGen(int, idxtype *, realtype *, realtype *, idxtype *, realtype *, +- int, int, int *, int *, int *, idxtype *); +- +diff --git a/mgridgen.pc.in b/mgridgen.pc.in +new file mode 100644 +index 0000000..d84810c +--- /dev/null ++++ b/mgridgen.pc.in @@ -0,0 +1,10 @@ -+## Source directory -+ -+INCLUDES = -I../IMlib -+ -+pkginclude_HEADERS = defs.h macros.h mgridgen.h proto.h struct.h -+pkgincludedir = $(includedir)/mgridgen -+ -+lib_LTLIBRARIES = libMGridGen.la -+libMGridGen_la_SOURCES = aratio.c coarsen.c kwayfm.c match.c merge.c mgridgen.c refine.c setup.c -+libMGridGen_la_LDFLAGS = -no-undefined -export-dynamic -version-info 1:0:0 ---- ParMGridGen-1.0-src/MGridGen/Programs/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ ParMGridGen-1.0/MGridGen/Programs/Makefile.am 2008-07-19 23:38:41.000000000 +0200 -@@ -0,0 +1,7 @@ -+## Source directory -+ -+INCLUDES = -I../IMlib -I../Lib -+ -+bin_PROGRAMS = mgridgen -+mgridgen_SOURCES = io.c mgridgen.c -+mgridgen_LDADD = ../IMlib/libIMlib.la ../Lib/libMGridGen.la -lm ---- ParMGridGen-1.0-src/ParMGridGen/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ ParMGridGen-1.0/ParMGridGen/Makefile.am 2008-07-20 16:04:31.000000000 +0200 -@@ -0,0 +1,4 @@ -+## middle directory -+ -+#Build in these directories: -+SUBDIRS= IMParMetis-2.0 ParLib Programs ---- ParMGridGen-1.0-src/ParMGridGen/IMParMetis-2.0/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ ParMGridGen-1.0/ParMGridGen/IMParMetis-2.0/Makefile.am 2008-07-20 15:24:55.000000000 +0200 -@@ -0,0 +1,4 @@ -+## middle directory -+ -+#Build in these directories: -+SUBDIRS= ParMETISLib ---- ParMGridGen-1.0-src/ParMGridGen/IMParMetis-2.0/ParMETISLib/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ ParMGridGen-1.0/ParMGridGen/IMParMetis-2.0/ParMETISLib/Makefile.am 2008-07-20 16:18:31.000000000 +0200 -@@ -0,0 +1,8 @@ -+## Source directory -+ -+pkginclude_HEADERS = defs.h macros.h parmetis.h proto.h rename.h struct.h -+pkgincludedir = $(includedir)/imparmetis ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ + -+lib_LTLIBRARIES = libIMparmetis.la -+libIMparmetis_la_SOURCES = coarsen.c comm.c debug.c diffuse.c drivers.c edge_refine.c fused.c grsetup.c iidxsort.c ikeysort.c memory.c remap.c setup.c timer.c util.c var.c -+libIMparmetis_la_LDFLAGS = -no-undefined -export-dynamic -version-info 1:0:0 ---- ParMGridGen-1.0-src/ParMGridGen/ParLib/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ ParMGridGen-1.0/ParMGridGen/ParLib/Makefile.am 2008-07-20 15:53:06.000000000 +0200 ++Name: MGridGen ++Description: Software for generating coarse grids ++Version: @VERSION@ ++Libs: -L${libdir} -lIMlib -lMGridGen ++Cflags: -I${includedir}/mgridgen +diff --git a/parmgridgen.h b/parmgridgen.h +deleted file mode 100644 +index 6a1a637..0000000 +--- a/parmgridgen.h ++++ /dev/null +@@ -1,5 +0,0 @@ +-typedef int idxtype; +-typedef double realtype; +- +-void ParMGridGen(idxtype *, idxtype *, realtype *, realtype *, idxtype *, +- realtype *, int *, int, int, int *, idxtype *, MPI_Comm *); +diff --git a/parmgridgen.pc.in b/parmgridgen.pc.in +new file mode 100644 +index 0000000..a11a597 +--- /dev/null ++++ b/parmgridgen.pc.in @@ -0,0 +1,10 @@ -+## Source directory -+ -+INCLUDES = -I$(top_builddir)/MGridGen/IMlib -+ -+pkginclude_HEADERS = defs.h macros.h parmgridgen.h proto.h rename.h struct.h -+pkgincludedir = $(includedir)/parmgridgen -+ -+lib_LTLIBRARIES = libParMGridGen.la -+libParMGridGen_la_SOURCES = comm.c debug.c grsetup.c ikeysort.c memory.c move.c parmgridgen.c setup.c util.c -+libParMGridGen_la_LDFLAGS = -no-undefined -export-dynamic -version-info 1:0:0 ---- ParMGridGen-1.0-src/ParMGridGen/Programs/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ ParMGridGen-1.0/ParMGridGen/Programs/Makefile.am 2008-07-20 16:24:19.000000000 +0200 -@@ -0,0 +1,21 @@ -+## Source directory -+ -+INCLUDES = -I../ParLib -I$(top_builddir)/MGridGen/IMlib -+ -+bin_PROGRAMS = parmgridgen -+parmgridgen_SOURCES = io.c main.c parmgridgen.c -+parmgridgen_LDADD = ../IMParMetis-2.0/ParMETISLib/libIMparmetis.la ../ParLib/libParMGridGen.la \ -+ $(top_builddir)/MGridGen/IMlib/libIMlib.la $(top_builddir)/MGridGen/Lib/libMGridGen.la @MPILIBS@ -+ -+# AM_CPPFLAGS = -I$(top_srcdir)/ParMETISLib -+# LDADD = $(top_builddir)/METISLib/libmetis.la \ -+# $(top_builddir)/ParMETISLib/libparmetis.la -+ -+# check_PROGRAMS = parmgridgen -+# parmgridgen_SOURCES = io.c main.c parmgridgen.c -+ -+MPIRUN = mpirun -np 4 -+ -+check-local: $(check_PROGRAMS) -+ $(MPIRUN) parmgridgen $(top_builddir)/Graphs/M6.metis 3 4 6 1 4 128 ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ + ++Name: ParMGridGen ++Description: Software for parallel (mpi) generating coarse grids ++Version: @VERSION@ ++Libs: -L${libdir} -lIMparmetis -lParMGridGen ++Cflags: -I${includedir}/imparmetis -I${includedir}/parmgridgen +-- +2.15.1 + diff --git a/sci-libs/parmgridgen/files/parmgridgen-1.0-format-security.patch b/sci-libs/parmgridgen/files/parmgridgen-1.0-format-security.patch new file mode 100644 index 00000000000..1ad445c705e --- /dev/null +++ b/sci-libs/parmgridgen/files/parmgridgen-1.0-format-security.patch @@ -0,0 +1,48 @@ + ParMGridGen/IMParMetis-2.0/ParMETISLib/util.c | 4 ++-- + ParMGridGen/ParLib/util.c | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/ParMGridGen/IMParMetis-2.0/ParMETISLib/util.c b/ParMGridGen/IMParMetis-2.0/ParMETISLib/util.c +index d0dfc91..941f68e 100644 +--- a/ParMGridGen/IMParMetis-2.0/ParMETISLib/util.c ++++ b/ParMGridGen/IMParMetis-2.0/ParMETISLib/util.c +@@ -25,7 +25,7 @@ void errexit(char *f_str,...) + + sprintf(out2, "Error! %s", out1); + +- fprintf(stdout, out2); ++ fprintf(stdout, "%s", out2); + fflush(stdout); + + abort(); +@@ -46,7 +46,7 @@ void myprintf(CtrlType *ctrl, char *f_str,...) + + sprintf(out2, "[%2d] %s", ctrl->mype, out1); + +- fprintf(stdout, out2); ++ fprintf(stdout, "%s", out2); + fflush(stdout); + + } +diff --git a/ParMGridGen/ParLib/util.c b/ParMGridGen/ParLib/util.c +index 9b8290d..c212b60 100644 +--- a/ParMGridGen/ParLib/util.c ++++ b/ParMGridGen/ParLib/util.c +@@ -25,7 +25,7 @@ void MGriderrexit(char *f_str,...) + + sprintf(out2, "Error! %s", out1); + +- fprintf(stdout, out2); ++ fprintf(stdout, "%s", out2); + fflush(stdout); + + abort(); +@@ -46,7 +46,7 @@ void MGridmyprintf(MGridCtrlType *ctrl, char *f_str,...) + + sprintf(out2, "[%2d] %s", ctrl->mype, out1); + +- fprintf(stdout, out2); ++ fprintf(stdout, "%s", out2); + fflush(stdout); + + } diff --git a/sci-libs/parmgridgen/files/parmgridgen-1.0-impl-fct.patch b/sci-libs/parmgridgen/files/parmgridgen-1.0-impl-fct.patch new file mode 100644 index 00000000000..1a464b99ed2 --- /dev/null +++ b/sci-libs/parmgridgen/files/parmgridgen-1.0-impl-fct.patch @@ -0,0 +1,70 @@ + ParMGridGen/ParLib/move.c | 1 + + ParMGridGen/ParLib/parmgridgen.c | 1 + + ParMGridGen/ParLib/util.c | 2 +- + ParMGridGen/Programs/io.c | 2 +- + ParMGridGen/Programs/parmgridgen.c | 2 +- + 5 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/ParMGridGen/ParLib/move.c b/ParMGridGen/ParLib/move.c +index 881b1ad..b02b467 100644 +--- a/ParMGridGen/ParLib/move.c ++++ b/ParMGridGen/ParLib/move.c +@@ -9,6 +9,7 @@ + */ + + #include "parmgridgen.h" ++#include "IMlib.h" + + /************************************************************************* + * This function moves the graph, and returns a new graph. +diff --git a/ParMGridGen/ParLib/parmgridgen.c b/ParMGridGen/ParLib/parmgridgen.c +index 6fd4aa3..262e05c 100644 +--- a/ParMGridGen/ParLib/parmgridgen.c ++++ b/ParMGridGen/ParLib/parmgridgen.c +@@ -9,6 +9,7 @@ + */ + + #include "parmgridgen.h" ++#include "IMlib.h" + + /*********************************************************************************** + * This function is the entry point of the parallel coarse grid construction. +diff --git a/ParMGridGen/ParLib/util.c b/ParMGridGen/ParLib/util.c +index 9b8290d..fa2e10a 100644 +--- a/ParMGridGen/ParLib/util.c ++++ b/ParMGridGen/ParLib/util.c +@@ -9,7 +9,7 @@ + */ + + #include "parmgridgen.h" +- ++#include "IMlib.h" + + /************************************************************************* + * This function prints an error message and exits +diff --git a/ParMGridGen/Programs/io.c b/ParMGridGen/Programs/io.c +index 318c8b4..ed5d495 100644 +--- a/ParMGridGen/Programs/io.c ++++ b/ParMGridGen/Programs/io.c +@@ -9,7 +9,7 @@ + */ + + #include "parmgridgen.h" +- ++#include "IMlib.h" + + /************************************************************************* + * This function reads the CSR matrix +diff --git a/ParMGridGen/Programs/parmgridgen.c b/ParMGridGen/Programs/parmgridgen.c +index 2c0d38c..e9956c5 100644 +--- a/ParMGridGen/Programs/parmgridgen.c ++++ b/ParMGridGen/Programs/parmgridgen.c +@@ -9,7 +9,7 @@ + */ + + #include "parmgridgen.h" +- ++#include "IMlib.h" + + /*********************************************************************************** + * This function is the testing routine for the adaptive multilevel partitioning code. diff --git a/sci-libs/parmgridgen/parmgridgen-1.0-r1.ebuild b/sci-libs/parmgridgen/parmgridgen-1.0-r1.ebuild new file mode 100644 index 00000000000..c94cad2a63a --- /dev/null +++ b/sci-libs/parmgridgen/parmgridgen-1.0-r1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools + +MYP=ParMGridGen-${PV} + +DESCRIPTION="Software for parallel (mpi) generating coarse grids" +HOMEPAGE="http://www-users.cs.umn.edu/~moulitsa/software.html"; +SRC_URI="http://www-users.cs.umn.edu/~moulitsa/download/${MYP}.tar.gz"; + +LICENSE="all-rights-reserved" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="static-libs" + +RESTRICT="mirror bindist" + +DEPEND="virtual/mpi" +RDEPEND="${DEPEND}" + +S=${WORKDIR}/${MYP} + +pkg_setup(){ + export CC=mpicc +} + +PATCHES=( + "${FILESDIR}/${P}-autotools.patch" + "${FILESDIR}/${P}-as-needed.patch" + "${FILESDIR}/${P}-format-security.patch" + "${FILESDIR}/${P}-impl-fct.patch" +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + $(use_enable static-libs static) +} + +src_install() { + default + dodoc README Doc/*.pdf +}
