summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Orlitzky <mjo@gentoo.org>2020-03-06 16:50:06 -0500
committerMichael Orlitzky <mjo@gentoo.org>2020-03-06 21:13:24 -0500
commit20a34c28e3afae7c20221d6fb76ae83d119c1375 (patch)
tree9bdaff3f686a9b25765f1fd0323963a8cb9861aa /sci-mathematics/glpk/files/glpk-4.65-debundle-system-libs.patch
parentmail-mta/opensmtpd: remove ancient ~6.0.3_p1 version (diff)
downloadgentoo-20a34c28e3afae7c20221d6fb76ae83d119c1375.tar.gz
gentoo-20a34c28e3afae7c20221d6fb76ae83d119c1375.tar.bz2
gentoo-20a34c28e3afae7c20221d6fb76ae83d119c1375.zip
sci-mathematics/glpk: new version 4.65.
This new upstream version fixes a few minor ebuild issues: * I've attempted to fix the MySQL include location in a more standard way, by using mysql_config (bug 597620). Another solution was already present in v4.63, so I've marked this bug as resolved. * The virtual/mysql dependency was replaced, per bug 666060. This will be completely resolved when v4.65 goes stable and v4.63 is removed. We also include a new patch, from upstream, to quiet some overly-verbose output. The patch to debundle the system libraries was forward-ported to the new version thanks to François Bissey, who maintained an ebuild for v4.65 in the sage-on-gentoo overlay until now. Bug: https://bugs.gentoo.org/666060 Closes: https://bugs.gentoo.org/597620 Closes: https://bugs.gentoo.org/711648 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Michael Orlitzky <mjo@gentoo.org>
Diffstat (limited to 'sci-mathematics/glpk/files/glpk-4.65-debundle-system-libs.patch')
-rw-r--r--sci-mathematics/glpk/files/glpk-4.65-debundle-system-libs.patch91
1 files changed, 91 insertions, 0 deletions
diff --git a/sci-mathematics/glpk/files/glpk-4.65-debundle-system-libs.patch b/sci-mathematics/glpk/files/glpk-4.65-debundle-system-libs.patch
new file mode 100644
index 000000000000..78af8b8d9431
--- /dev/null
+++ b/sci-mathematics/glpk/files/glpk-4.65-debundle-system-libs.patch
@@ -0,0 +1,91 @@
+diff --git a/configure.ac b/configure.ac
+index 96c4cc5..29e11f9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -69,6 +69,11 @@ AC_PROG_LIBTOOL
+ dnl Check for math library
+ AC_CHECK_LIB([m], [exp])
+
++AC_CHECK_LIB([amd], [amd_1])
++AC_CHECK_LIB([colamd], [colamd])
++AC_CHECK_HEADER([amd.h])
++AC_CHECK_LIB([z], [gzopen])
++
+ dnl Check for <sys/time.h> header
+ AC_CHECK_HEADER([sys/time.h],
+ AC_DEFINE([HAVE_SYS_TIME_H], [1], [N/A]))
+diff --git a/src/Makefile.am b/src/Makefile.am
+index eb5dc1b..b814627 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -6,10 +6,8 @@ lib_LTLIBRARIES = libglpk.la
+
+ libglpk_la_CPPFLAGS = \
+ -I$(srcdir) \
+--I$(srcdir)/amd \
+ -I$(srcdir)/api \
+ -I$(srcdir)/bflib \
+--I$(srcdir)/colamd \
+ -I$(srcdir)/draft \
+ -I$(srcdir)/env \
+ -I$(srcdir)/intopt \
+@@ -18,8 +16,7 @@ libglpk_la_CPPFLAGS = \
+ -I$(srcdir)/mpl \
+ -I$(srcdir)/npp \
+ -I$(srcdir)/proxy \
+--I$(srcdir)/simplex \
+--I$(srcdir)/zlib
++-I$(srcdir)/simplex
+
+ libglpk_la_LDFLAGS = \
+ -version-info 43:0:3 \
+@@ -27,18 +24,6 @@ libglpk_la_LDFLAGS = \
+ ${NOUNDEFINED}
+
+ libglpk_la_SOURCES = \
+-amd/amd_1.c \
+-amd/amd_2.c \
+-amd/amd_aat.c \
+-amd/amd_control.c \
+-amd/amd_defaults.c \
+-amd/amd_dump.c \
+-amd/amd_info.c \
+-amd/amd_order.c \
+-amd/amd_post_tree.c \
+-amd/amd_postorder.c \
+-amd/amd_preprocess.c \
+-amd/amd_valid.c \
+ api/advbas.c \
+ api/asnhall.c \
+ api/asnlp.c \
+@@ -104,7 +89,6 @@ bflib/scf.c \
+ bflib/scfint.c \
+ bflib/sgf.c \
+ bflib/sva.c \
+-colamd/colamd.c \
+ draft/bfd.c \
+ draft/bfx.c \
+ draft/glpapi06.c \
+@@ -202,21 +186,6 @@ simplex/spxprim.c \
+ simplex/spxprob.c \
+ simplex/spychuzc.c \
+ simplex/spychuzr.c \
+-simplex/spydual.c \
+-zlib/adler32.c \
+-zlib/compress.c \
+-zlib/crc32.c \
+-zlib/deflate.c \
+-zlib/gzclose.c \
+-zlib/gzlib.c \
+-zlib/gzread.c \
+-zlib/gzwrite.c \
+-zlib/inffast.c \
+-zlib/inflate.c \
+-zlib/inftrees.c \
+-zlib/trees.c \
+-zlib/uncompr.c \
+-zlib/zio.c \
+-zlib/zutil.c
++simplex/spydual.c
+
+ ## eof ##