diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
commit | 623ee73d661e5ed8475cb264511f683407d87365 (patch) | |
tree | 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /sci-mathematics/glpk | |
parent | ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff) |
gentoo Easter resync : 12.04.2020
Diffstat (limited to 'sci-mathematics/glpk')
-rw-r--r-- | sci-mathematics/glpk/Manifest | 9 | ||||
-rw-r--r-- | sci-mathematics/glpk/files/glpk-4.65-debundle-system-libs.patch | 91 | ||||
-rw-r--r-- | sci-mathematics/glpk/files/glpk-4.65-fix-mysql-include-prefix.patch | 47 | ||||
-rw-r--r-- | sci-mathematics/glpk/files/glpk-4.65-longstep_verbosity.patch | 23 | ||||
-rw-r--r-- | sci-mathematics/glpk/glpk-4.63.ebuild | 2 | ||||
-rw-r--r-- | sci-mathematics/glpk/glpk-4.65.ebuild | 69 | ||||
-rw-r--r-- | sci-mathematics/glpk/metadata.xml | 19 |
7 files changed, 253 insertions, 7 deletions
diff --git a/sci-mathematics/glpk/Manifest b/sci-mathematics/glpk/Manifest index ea88e5dcd571..e8337e380151 100644 --- a/sci-mathematics/glpk/Manifest +++ b/sci-mathematics/glpk/Manifest @@ -1,4 +1,9 @@ AUX glpk-4.63-debundle-system-libs.patch 2240 BLAKE2B 5bd0d25768682a410159e3bf0eaf83dc038da8c6bda275c6994846516bb347caf6d4ea726e8635c77b84a463cb1ec32955f573589291486067c651a88d7f276c SHA512 186c1dd2197119b376a76a2db9a73d7fc1e43adc6ae54f5d3e39ad9114a9a406d45dd7bce4bcea31cfce94e71234b70872db22378e8312026912a93077488805 +AUX glpk-4.65-debundle-system-libs.patch 1930 BLAKE2B 0c265afe9338e75bb3d6536e9e0b2f473e15b4b524b29244bd6bce44a1f77e48c122a463a3800a246435b47d240e799fd16a21ef5c66eb00643759774c47ef73 SHA512 940c2d3dc12efd8df90c17277630a60ea6682eff0323ea82eeb8b81377db612103c29fb44bbe8ff936d96a436548be3e4c772f55f8412adaad546a6381be6333 +AUX glpk-4.65-fix-mysql-include-prefix.patch 1837 BLAKE2B ecd90024e07f29e8ebb6af80b520c8f192cfea21c90d8c247001389f2ccfcf24ad487981a0cc719d1ca99e266dd2a9d66f6416d4f2d5e7c80bdf807b9bb7b74e SHA512 c74281bf3e03e136d183b562b8f682a3e1957019a36ec0c6a048049f0d5f55361107a62e36eaa9e3306a1f13df10adf55c2f54f096b6e353108856e05d9ce799 +AUX glpk-4.65-longstep_verbosity.patch 844 BLAKE2B c1d14e6dfd596694bf1da060129713eb70ceebd4b1742e8496b89c1e1bfefa5bfdf320ecb8d863aa5b5a0d9750bca8bf59b261608cc39b1d1a0b3fe3b10a7be4 SHA512 29d8e876c0d5fba14056e8f0639e3746c6f4c0eefcad284727921e0ca7184ad96b4363dfe9bfe67b74d6d9419f37d21e453e431bf53438b624c1ab0ef9fe1092 DIST glpk-4.63.tar.gz 4131787 BLAKE2B 791fa1a1424011668019e180fc245c0319f601255f596affe87afa0df47d9d615a8accd794d51c15bff5fe4fe6409369362f6c9e82bdde67903177b8da55e891 SHA512 3ee9b9ec5322282a9c62b2ee209fc7760383a6a764ef3816445ffb66f15ed4d00309bff1b98d50c243b58aa74f83072afde45c389799e637e11e86f4db45276c -EBUILD glpk-4.63.ebuild 1458 BLAKE2B 521546a879c84b90bb7945a8cc8f5193b0a2d3d01d19eca0e2e036a219dde203a39b8687738154beb2b783843a870eb544c3cbba43d2cd6443a3e291e96e0059 SHA512 f1f080df14f6df511d12c6f56d463d62b1ef4f8814c6ea08e12ce278496f2c968a5d2bb57ca350ac8d63bef7210fc6f4ba4493baa402fbe3ce07a2d4185d96af -MISC metadata.xml 668 BLAKE2B 9dec50a5d6aa33f108651ed8fd891750fc8146eedf8df28abc0fa04a6db2f0d590073fe3606c658a99d56d283d7a24629503bbf11f6593ef1b90314d26a1ab69 SHA512 0c37b2854097a14a58070b1651ccdcdfae652e7d2b5afd62c617e22fa0256acee07aab0409f6621382151e1fb5e605002a3a809113693b2078054a4b16e72452 +DIST glpk-4.65.tar.gz 4167110 BLAKE2B 4ccb5cd8301bdca2ccdecfc1648642afe26ff0a1ee9a75cb5a3906838086e5c41edfb16e7c55f4ad677d192f6a66b866f2d917c5be7103da7141bfb1f74e636b SHA512 997e8e599ff1718a08c66b86eadd0e01f4644899f1e95920f8ae91d66b4d8361021766b346845f4dcbcfe667b41ab72ea3d377017a0ebf85d7ece091cfd81375 +EBUILD glpk-4.63.ebuild 1460 BLAKE2B 87059596f20960dc68de7bd7fd804bbb7774ea373601782da090fa3dad4403e28725cfed8dc31bb25c0a229ff5275b7950665c31baf2f2fdf9c88f0489f25073 SHA512 3d5c104f103f46440499181f5c0155ca1a8d4b7418fc8c93bcff7382601f4fbcd2380ea3a637ad469c0ac3a579b67b6c011ecdcfaf66fb0cd40adb33c675dff3 +EBUILD glpk-4.65.ebuild 1792 BLAKE2B f32f1e3e8d84be2e5419114abb7aee35ad0e6c5692bb01835f58d869b571832dbc2d49f1cb8ad42fbb7a2edcc632f7a0b167fbe27c59ed05ba3a5dcfb5643a2d SHA512 31041d5866fbd516cba4f7db1332de86f0d47820da51d5cc30a22dc1109df7cf7465af31e489779c94e5faab9c4c126ef13f6ad7662d397e5ffdc3aac99d7542 +MISC metadata.xml 998 BLAKE2B 11afba9ccdd6a53cee9432201eee2ae03483da71212f1c7f9907a775e6c2fcce068648fdae87965dab7550c9157c86697802707b582589626cf48e4236aa56e0 SHA512 1ef83c282b3a6143a1e85a1ecdc55463cf5617409dc990806917077c30e4acd2663b2772bf47aa96c572ee78dab76467c10b4ae9a2705220aa6e8e4936c4f7b5 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 ## diff --git a/sci-mathematics/glpk/files/glpk-4.65-fix-mysql-include-prefix.patch b/sci-mathematics/glpk/files/glpk-4.65-fix-mysql-include-prefix.patch new file mode 100644 index 000000000000..4dd6583d6dea --- /dev/null +++ b/sci-mathematics/glpk/files/glpk-4.65-fix-mysql-include-prefix.patch @@ -0,0 +1,47 @@ +From 5cff695e9eb8405efbdfa976f1fad965c55436e8 Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Fri, 6 Mar 2020 16:24:10 -0500 +Subject: [PATCH 1/1] configure.ac: attempt mysql_config to find the MySQL + headers. + +When building with MySQL support, the configure script guesses that +the path to the MySQL headers is /usr/include/mysql. That is usually +correct, but when people install MySQL to a nonstandard location such +as /home/mjo/usr, it falls over. Fortunately, MySQL usually provides +an executable called "mysql_config" that can output the location of +its headers. + +In such a "local" installation, if I prepend /home/mjo/usr/bin to my +PATH, then running "mysql_config" will execute the mysql_config from +/home/mjo/usr/bin and will therefore output -I/home/mjo/usr/include as +the preprocessor flag that glpk needs. That's the right thing to do, +and it works just as well for a system install under /usr or +/usr/local. + +This commit attempts to find the headers using mysql_config first, +and falls back to the location /usr/include/mysql. + +Gentoo-bug: https://bugs.gentoo.org/597620 +--- + configure.ac | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 96c4cc5..d20a6ef 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -145,7 +145,10 @@ if test "$enable_mysql" = "yes"; then + AC_MSG_ERROR([--enable-mysql requires --enable-dl]) + fi + AC_MSG_RESULT([yes]) +- CPPFLAGS="-I/usr/include/mysql $CPPFLAGS" ++ # Guess at the include directory if mysql_config isn't in our PATH. ++ MYSQL_INCLUDE=$(mysql_config --include 2>/dev/null) ++ test -z "${MYSQL_INCLUDE}" && MYSQL_INCLUDE="-I/usr/include/mysql" ++ CPPFLAGS="${MYSQL_INCLUDE} $CPPFLAGS" + AC_DEFINE_UNQUOTED([MYSQL_DLNAME], ["$LIBMYSQL"], [N/A]) + else + AC_MSG_RESULT([no]) +-- +2.24.1 + diff --git a/sci-mathematics/glpk/files/glpk-4.65-longstep_verbosity.patch b/sci-mathematics/glpk/files/glpk-4.65-longstep_verbosity.patch new file mode 100644 index 000000000000..1b78ece3e695 --- /dev/null +++ b/sci-mathematics/glpk/files/glpk-4.65-longstep_verbosity.patch @@ -0,0 +1,23 @@ +http://lists.gnu.org/archive/html/bug-glpk/2018-03/msg00000.html + +diff --git a/src/draft/glpios03.c b/src/draft/glpios03.c +index 21d6a00..eb34ad0 100644 +--- a/src/draft/glpios03.c ++++ b/src/draft/glpios03.c +@@ -920,13 +920,10 @@ int ios_driver(glp_tree *T) + #if 0 + ((glp_iocp *)T->parm)->msg_lev = GLP_MSG_DBG; + #endif +-#if 1 /* 16/III-2016 */ ++#if 1 /* 01/III-2018 */ + if (((glp_iocp *)T->parm)->flip) +-#if 0 /* 20/I-2018 */ +- xprintf("WARNING: LONG-STEP DUAL SIMPLEX WILL BE USED\n"); +-#else +- xprintf("Long-step dual simplex will be used\n"); +-#endif ++ if (T->parm->msg_lev >= GLP_MSG_ALL) ++ xprintf("Long-step dual simplex will be used\n"); + #endif + /* on entry to the B&B driver it is assumed that the active list + contains the only active (i.e. root) subproblem, which is the diff --git a/sci-mathematics/glpk/glpk-4.63.ebuild b/sci-mathematics/glpk/glpk-4.63.ebuild index 8236a7344d2f..e895918d23a1 100644 --- a/sci-mathematics/glpk/glpk-4.63.ebuild +++ b/sci-mathematics/glpk/glpk-4.63.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" SLOT="0/40" IUSE="doc examples gmp odbc mysql static-libs" -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" RDEPEND=" sci-libs/amd:0= diff --git a/sci-mathematics/glpk/glpk-4.65.ebuild b/sci-mathematics/glpk/glpk-4.65.ebuild new file mode 100644 index 000000000000..258796fa21ae --- /dev/null +++ b/sci-mathematics/glpk/glpk-4.65.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic toolchain-funcs + +DESCRIPTION="GNU Linear Programming Kit" +LICENSE="GPL-3" +HOMEPAGE="https://www.gnu.org/software/glpk/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + +SLOT="0/40" +IUSE="doc examples gmp odbc mysql static-libs" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" + +BDEPEND="virtual/pkgconfig" +DEPEND=" + sci-libs/amd:0= + sci-libs/colamd:= + sys-libs/zlib:0= + gmp? ( dev-libs/gmp:0= ) + mysql? ( dev-db/mysql-connector-c ) + odbc? ( || ( dev-db/libiodbc:0 dev-db/unixODBC:0 ) )" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-4.65-fix-mysql-include-prefix.patch" + "${FILESDIR}/${PN}-4.65-debundle-system-libs.patch" + "${FILESDIR}/${PN}-4.65-longstep_verbosity.patch" +) + +src_prepare() { + # TODO: the ODBC library is dlopen()ed, so we only want to append + # -I<foo> to the preprocessor flags, and not all of the CFLAGS that + # were used to build libiodbc. That fix and the pkg-config fallback + # should be sent upstream, and placed into CPPFLAGS rather than + # CFLAGS (as configure.ac does now). + use odbc && [[ -z $(type -P odbc_config) ]] && \ + append-cppflags $($(tc-getPKG_CONFIG) --cflags libiodbc) + + default + eautoreconf +} + +src_configure() { + local myconf + if use mysql || use odbc; then + myconf="--enable-dl" + else + myconf="--disable-dl" + fi + + econf ${myconf} \ + $(use_enable mysql) \ + $(use_enable odbc) \ + $(use_enable static-libs static) \ + $(use_with gmp) +} + +src_install() { + default + if use examples; then + insinto "/usr/share/doc/${PF}" + doins -r examples + docompress -x "/usr/share/doc/${PF}/examples" + fi + use doc && dodoc doc/*.pdf doc/notes/*.pdf doc/*.txt +} diff --git a/sci-mathematics/glpk/metadata.xml b/sci-mathematics/glpk/metadata.xml index 237a45406ed4..eef02da51bb6 100644 --- a/sci-mathematics/glpk/metadata.xml +++ b/sci-mathematics/glpk/metadata.xml @@ -4,14 +4,25 @@ <maintainer type="person"> <email>robbat2@gentoo.org</email> </maintainer> + <maintainer type="person"> + <email>mjo@gentoo.org</email> + </maintainer> + <maintainer type="person"> + <email>frp.bissey@gmail.com</email> + <name>François Bissey</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <maintainer type="project"> <email>sci-mathematics@gentoo.org</email> <name>Gentoo Mathematics Project</name> </maintainer> <longdescription lang="en"> - The GNU Linear Programming Kit package is intended for solving - large-scale linear programming (LP), mixed integer programming - (MIP), and other related problems. It is a set of routines written - in ANSI C and organized in the form of a callable library. + The GNU Linear Programming Kit package is intended for solving + large-scale linear programming (LP), mixed integer programming + (MIP), and other related problems. It is a set of routines written + in ANSI C and organized in the form of a callable library. </longdescription> </pkgmetadata> |