* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/, sci-mathematics/glpk/files/
@ 2024-10-24 14:36 Michael Orlitzky
0 siblings, 0 replies; 7+ messages in thread
From: Michael Orlitzky @ 2024-10-24 14:36 UTC (permalink / raw
To: gentoo-commits
commit: e9cc5b98df6ccbfc116cd7340f1aa63e56a233cb
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 21 17:04:12 2024 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Thu Oct 24 14:36:14 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9cc5b98
sci-mathematics/glpk: steal strict-aliasing patch from Fedora
This lets us bring LTO back without having to be responsible for a
custom patch.
Bug: https://bugs.gentoo.org/863047
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
sci-mathematics/glpk/files/glpk-5.0-aliasing.patch | 89 ++++++++++++++++++++++
.../{glpk-5.0-r2.ebuild => glpk-5.0-r3.ebuild} | 10 +--
2 files changed, 90 insertions(+), 9 deletions(-)
diff --git a/sci-mathematics/glpk/files/glpk-5.0-aliasing.patch b/sci-mathematics/glpk/files/glpk-5.0-aliasing.patch
new file mode 100644
index 000000000000..91ca8b189bb6
--- /dev/null
+++ b/sci-mathematics/glpk/files/glpk-5.0-aliasing.patch
@@ -0,0 +1,89 @@
+Stolen from Fedora:
+
+ https://src.fedoraproject.org/rpms/glpk/raw/rawhide/f/glpk-4.65-alias.patch
+
+diff -urN glpk-4.65.orig/src/minisat/minisat.c glpk-4.65/src/minisat/minisat.c
+--- glpk-4.65.orig/src/minisat/minisat.c 2018-02-16 00:00:00.000000000 -0700
++++ glpk-4.65/src/minisat/minisat.c 2018-05-20 18:54:25.106624859 -0600
+@@ -135,11 +135,11 @@ struct clause_t
+
+ #define clause_learnt(c) ((c)->size_learnt & 1)
+
+-#define clause_activity(c) \
+- (*((float*)&(c)->lits[(c)->size_learnt>>1]))
++#define clause_activity(c, a) \
++ memcpy(&(a), &(c)->lits[(c)->size_learnt>>1], sizeof(float))
+
+ #define clause_setactivity(c, a) \
+- (void)(*((float*)&(c)->lits[(c)->size_learnt>>1]) = (a))
++ memcpy(&(c)->lits[(c)->size_learnt>>1], &(a), sizeof(float))
+
+ /*====================================================================*/
+ /* Encode literals in clause pointers: */
+@@ -313,14 +313,18 @@ static inline void act_clause_rescale(so
+ clause** cs = (clause**)vecp_begin(&s->learnts);
+ int i;
+ for (i = 0; i < vecp_size(&s->learnts); i++){
+- float a = clause_activity(cs[i]);
+- clause_setactivity(cs[i], a * (float)1e-20);
++ float a;
++ clause_activity(cs[i], a);
++ a *= (float)1e-20;
++ clause_setactivity(cs[i], a);
+ }
+ s->cla_inc *= (float)1e-20;
+ }
+
+ static inline void act_clause_bump(solver* s, clause *c) {
+- float a = clause_activity(c) + s->cla_inc;
++ float a;
++ clause_activity(c, a);
++ a += s->cla_inc;
+ clause_setactivity(c,a);
+ if (a > 1e20) act_clause_rescale(s);
+ }
+@@ -356,7 +360,7 @@ static clause* clause_new(solver* s, lit
+ c->lits[i] = begin[i];
+
+ if (learnt)
+- *((float*)&c->lits[size]) = 0.0;
++ memset(&c->lits[size], 0, sizeof(float));
+
+ assert(begin[0] >= 0);
+ assert(begin[0] < s->size*2);
+@@ -850,10 +854,17 @@ clause* solver_propagate(solver* s)
+ }
+
+ static inline int clause_cmp (const void* x, const void* y) {
+- return clause_size((clause*)x) > 2
+- && (clause_size((clause*)y) == 2
+- || clause_activity((clause*)x)
+- < clause_activity((clause*)y)) ? -1 : 1; }
++ clause *cx = (clause *)x;
++ clause *cy = (clause *)y;
++ float fx, fy;
++ if (clause_size(cx) <= 2)
++ return 1;
++ if (clause_size(cy) == 2)
++ return -1;
++ clause_activity(cx, fx);
++ clause_activity(cy, fy);
++ return fx < fy ? -1 : 1;
++}
+
+ void solver_reducedb(solver* s)
+ {
+@@ -874,10 +885,12 @@ void solver_reducedb(solver* s)
+ learnts[j++] = learnts[i];
+ }
+ for (; i < vecp_size(&s->learnts); i++){
++ float f;
++ clause_activity(learnts[i], f);
+ if (clause_size(learnts[i]) > 2
+ && reasons[lit_var(*clause_begin(learnts[i]))]
+ != learnts[i]
+- && clause_activity(learnts[i]) < extra_lim)
++ && f < extra_lim)
+ clause_remove(s,learnts[i]);
+ else
+ learnts[j++] = learnts[i];
diff --git a/sci-mathematics/glpk/glpk-5.0-r2.ebuild b/sci-mathematics/glpk/glpk-5.0-r3.ebuild
similarity index 90%
rename from sci-mathematics/glpk/glpk-5.0-r2.ebuild
rename to sci-mathematics/glpk/glpk-5.0-r3.ebuild
index ec74e25882a4..477d3016240a 100644
--- a/sci-mathematics/glpk/glpk-5.0-r2.ebuild
+++ b/sci-mathematics/glpk/glpk-5.0-r3.ebuild
@@ -36,6 +36,7 @@ RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}"/${PN}-4.65-fix-mysql-include-prefix.patch
"${FILESDIR}"/${PN}-4.65-debundle-system-libs.patch
+ "${FILESDIR}"/${PN}-5.0-aliasing.patch
)
src_prepare() {
@@ -53,15 +54,6 @@ src_prepare() {
}
src_configure() {
- # -Werror=strict-aliasing
- # https://bugs.gentoo.org/863047
- # https://lists.gnu.org/archive/html/bug-glpk/2022-08/msg00000.html
- # No upstream response...
- #
- # Do not trust it to LTO either.
- append-flags -fno-strict-aliasing
- filter-lto
-
local myconf
if use mysql || use odbc; then
myconf="--enable-dl"
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/, sci-mathematics/glpk/files/
@ 2021-11-02 23:12 Michael Orlitzky
0 siblings, 0 replies; 7+ messages in thread
From: Michael Orlitzky @ 2021-11-02 23:12 UTC (permalink / raw
To: gentoo-commits
commit: d6ff8dba33190ef7bc124b688c9d8ccaa3839cce
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 2 22:52:24 2021 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Tue Nov 2 23:05:47 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6ff8dba
sci-mathematics/glpk: remove old "unused" glpk-4.65.ebuild.
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
sci-mathematics/glpk/Manifest | 1 -
.../glpk/files/glpk-4.65-longstep_verbosity.patch | 23 -------
sci-mathematics/glpk/glpk-4.65.ebuild | 77 ----------------------
3 files changed, 101 deletions(-)
diff --git a/sci-mathematics/glpk/Manifest b/sci-mathematics/glpk/Manifest
index 30d7dbde93e..6558f5696c6 100644
--- a/sci-mathematics/glpk/Manifest
+++ b/sci-mathematics/glpk/Manifest
@@ -1,2 +1 @@
-DIST glpk-4.65.tar.gz 4167110 BLAKE2B 4ccb5cd8301bdca2ccdecfc1648642afe26ff0a1ee9a75cb5a3906838086e5c41edfb16e7c55f4ad677d192f6a66b866f2d917c5be7103da7141bfb1f74e636b SHA512 997e8e599ff1718a08c66b86eadd0e01f4644899f1e95920f8ae91d66b4d8361021766b346845f4dcbcfe667b41ab72ea3d377017a0ebf85d7ece091cfd81375
DIST glpk-5.0.tar.gz 4132649 BLAKE2B f8204f66a97af950c13ee72ee9541f305745741d1231325670ede14663cb6c28ec6fbc44b3625973f1924ca078183d1d43f494ad43a7b48b45be131882b00001 SHA512 4e92195fa058c707146f2690f3a38b46c33add948c852f67659ca005a6aa980bbf97be96528b0f8391690facb880ac2126cd60198c6c175e7f3f06cca7e29f9d
diff --git a/sci-mathematics/glpk/files/glpk-4.65-longstep_verbosity.patch b/sci-mathematics/glpk/files/glpk-4.65-longstep_verbosity.patch
deleted file mode 100644
index 1b78ece3e69..00000000000
--- a/sci-mathematics/glpk/files/glpk-4.65-longstep_verbosity.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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.65.ebuild b/sci-mathematics/glpk/glpk-4.65.ebuild
deleted file mode 100644
index abc284449ff..00000000000
--- a/sci-mathematics/glpk/glpk-4.65.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 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"
-HOMEPAGE="https://www.gnu.org/software/glpk/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/40"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples gmp odbc mysql"
-
-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} \
- --disable-static \
- $(use_enable mysql) \
- $(use_enable odbc) \
- $(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
-
- # no static archives
- find "${D}" -name '*.la' -delete || die
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/, sci-mathematics/glpk/files/
@ 2020-04-13 17:38 Michael Orlitzky
0 siblings, 0 replies; 7+ messages in thread
From: Michael Orlitzky @ 2020-04-13 17:38 UTC (permalink / raw
To: gentoo-commits
commit: 8d6799bcf05704fc9645c8a5668edc16e8c39cf6
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 13 17:36:52 2020 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Mon Apr 13 17:36:52 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d6799bc
sci-mathematics/glpk: remove old "unused" version and files.
Closes: https://bugs.gentoo.org/666060
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
sci-mathematics/glpk/Manifest | 1 -
.../files/glpk-4.63-debundle-system-libs.patch | 94 ----------------------
sci-mathematics/glpk/glpk-4.63.ebuild | 63 ---------------
3 files changed, 158 deletions(-)
diff --git a/sci-mathematics/glpk/Manifest b/sci-mathematics/glpk/Manifest
index 6c89c63e486..05714aa32b3 100644
--- a/sci-mathematics/glpk/Manifest
+++ b/sci-mathematics/glpk/Manifest
@@ -1,2 +1 @@
-DIST glpk-4.63.tar.gz 4131787 BLAKE2B 791fa1a1424011668019e180fc245c0319f601255f596affe87afa0df47d9d615a8accd794d51c15bff5fe4fe6409369362f6c9e82bdde67903177b8da55e891 SHA512 3ee9b9ec5322282a9c62b2ee209fc7760383a6a764ef3816445ffb66f15ed4d00309bff1b98d50c243b58aa74f83072afde45c389799e637e11e86f4db45276c
DIST glpk-4.65.tar.gz 4167110 BLAKE2B 4ccb5cd8301bdca2ccdecfc1648642afe26ff0a1ee9a75cb5a3906838086e5c41edfb16e7c55f4ad677d192f6a66b866f2d917c5be7103da7141bfb1f74e636b SHA512 997e8e599ff1718a08c66b86eadd0e01f4644899f1e95920f8ae91d66b4d8361021766b346845f4dcbcfe667b41ab72ea3d377017a0ebf85d7ece091cfd81375
diff --git a/sci-mathematics/glpk/files/glpk-4.63-debundle-system-libs.patch b/sci-mathematics/glpk/files/glpk-4.63-debundle-system-libs.patch
deleted file mode 100644
index e836219d0ad..00000000000
--- a/sci-mathematics/glpk/files/glpk-4.63-debundle-system-libs.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-Remove suitesparse (camd,colamd) and zlib bundles
-bicatali - apr 2014
-Updated for 4.57 by soap (Jan 2016)
-Updated for 4.60 by bicatali (Dec 2016)
-Updated for 4.63 by bicatali (Jul 2017)
-
-diff -Nuar --exclude '*.orig' --exclude '*.rej' --exclude '*~' glpk-4.63.orig/configure.ac glpk-4.63/configure.ac
---- glpk-4.63.orig/configure.ac 2017-07-25 00:00:00.000000000 -0700
-+++ glpk-4.63/configure.ac 2017-07-27 14:10:47.986520907 -0700
-@@ -69,6 +69,11 @@
- 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 -Nuar --exclude '*.orig' --exclude '*.rej' --exclude '*~' glpk-4.63.orig/src/Makefile.am glpk-4.63/src/Makefile.am
---- glpk-4.63.orig/src/Makefile.am 2017-07-25 00:00:00.000000000 -0700
-+++ glpk-4.63/src/Makefile.am 2017-07-27 14:11:30.841536062 -0700
-@@ -6,18 +6,15 @@
-
- libglpk_la_CPPFLAGS = \
- -I$(srcdir) \
---I$(srcdir)/amd \
- -I$(srcdir)/api \
- -I$(srcdir)/bflib \
- -I$(srcdir)/cglib \
---I$(srcdir)/colamd \
- -I$(srcdir)/env \
- -I$(srcdir)/minisat \
- -I$(srcdir)/misc \
- -I$(srcdir)/mpl \
- -I$(srcdir)/proxy \
---I$(srcdir)/simplex \
---I$(srcdir)/zlib
-+-I$(srcdir)/simplex
-
- libglpk_la_LDFLAGS = \
- -version-info 42:2:2 \
-@@ -57,18 +54,6 @@
- glpssx01.c \
- glpssx02.c \
- lux.c \
--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 \
-@@ -142,7 +127,6 @@
- cglib/gmigen.c \
- cglib/mirgen.c \
- cglib/spv.c \
--colamd/colamd.c \
- env/alloc.c \
- env/dlsup.c \
- env/env.c \
-@@ -196,21 +180,6 @@
- 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/glpk-4.63.ebuild b/sci-mathematics/glpk/glpk-4.63.ebuild
deleted file mode 100644
index e895918d23a..00000000000
--- a/sci-mathematics/glpk/glpk-4.63.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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"
-
-RDEPEND="
- sci-libs/amd:0=
- sci-libs/colamd:=
- sys-libs/zlib:0=
- gmp? ( dev-libs/gmp:0= )
- mysql? ( virtual/mysql )
- odbc? ( || ( dev-db/libiodbc:0 dev-db/unixODBC:0 ) )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.63-debundle-system-libs.patch
-)
-
-src_prepare() {
- sed -e 's#CPPFLAGS="-I/usr/include/mysql#CPPFLAGS="-I'"${EPREFIX}"'/usr/include/mysql#' -i configure.ac || die
- 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
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/, sci-mathematics/glpk/files/
@ 2020-03-07 2:23 Michael Orlitzky
0 siblings, 0 replies; 7+ messages in thread
From: Michael Orlitzky @ 2020-03-07 2:23 UTC (permalink / raw
To: gentoo-commits
commit: 20a34c28e3afae7c20221d6fb76ae83d119c1375
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 6 21:50:06 2020 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sat Mar 7 02:13:24 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20a34c28
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 <AT> gentoo.org>
sci-mathematics/glpk/Manifest | 1 +
.../files/glpk-4.65-debundle-system-libs.patch | 91 ++++++++++++++++++++++
.../files/glpk-4.65-fix-mysql-include-prefix.patch | 47 +++++++++++
.../glpk/files/glpk-4.65-longstep_verbosity.patch | 23 ++++++
sci-mathematics/glpk/glpk-4.65.ebuild | 69 ++++++++++++++++
5 files changed, 231 insertions(+)
diff --git a/sci-mathematics/glpk/Manifest b/sci-mathematics/glpk/Manifest
index e7dae3fabf9..6c89c63e486 100644
--- a/sci-mathematics/glpk/Manifest
+++ b/sci-mathematics/glpk/Manifest
@@ -1 +1,2 @@
DIST glpk-4.63.tar.gz 4131787 BLAKE2B 791fa1a1424011668019e180fc245c0319f601255f596affe87afa0df47d9d615a8accd794d51c15bff5fe4fe6409369362f6c9e82bdde67903177b8da55e891 SHA512 3ee9b9ec5322282a9c62b2ee209fc7760383a6a764ef3816445ffb66f15ed4d00309bff1b98d50c243b58aa74f83072afde45c389799e637e11e86f4db45276c
+DIST glpk-4.65.tar.gz 4167110 BLAKE2B 4ccb5cd8301bdca2ccdecfc1648642afe26ff0a1ee9a75cb5a3906838086e5c41edfb16e7c55f4ad677d192f6a66b866f2d917c5be7103da7141bfb1f74e636b SHA512 997e8e599ff1718a08c66b86eadd0e01f4644899f1e95920f8ae91d66b4d8361021766b346845f4dcbcfe667b41ab72ea3d377017a0ebf85d7ece091cfd81375
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 00000000000..78af8b8d943
--- /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 00000000000..4dd6583d6de
--- /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 00000000000..1b78ece3e69
--- /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.65.ebuild b/sci-mathematics/glpk/glpk-4.65.ebuild
new file mode 100644
index 00000000000..258796fa21a
--- /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
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/, sci-mathematics/glpk/files/
@ 2018-04-18 16:44 David Seifert
0 siblings, 0 replies; 7+ messages in thread
From: David Seifert @ 2018-04-18 16:44 UTC (permalink / raw
To: gentoo-commits
commit: 43dcca1e982da01f52b0bd50a5510c6581145dc4
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 18 12:50:45 2018 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Apr 18 16:44:11 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43dcca1e
sci-mathematics/glpk: Remove old
Package-Manager: Portage-2.3.29, Repoman-2.3.9
Closes: https://bugs.gentoo.org/626228
Closes: https://github.com/gentoo/gentoo/pull/8056
sci-mathematics/glpk/Manifest | 7 --
.../glpk/files/glpk-4.52.1-mariadb-5.5.patch | 11 ---
.../files/glpk-4.54-debundle-system-libs.patch | 86 --------------------
.../files/glpk-4.57-debundle-system-libs.patch | 88 ---------------------
.../files/glpk-4.60-debundle-system-libs.patch | 92 ----------------------
sci-mathematics/glpk/glpk-4.45.ebuild | 63 ---------------
sci-mathematics/glpk/glpk-4.48.ebuild | 52 ------------
sci-mathematics/glpk/glpk-4.54.ebuild | 58 --------------
sci-mathematics/glpk/glpk-4.55.ebuild | 58 --------------
sci-mathematics/glpk/glpk-4.57.ebuild | 61 --------------
sci-mathematics/glpk/glpk-4.60.ebuild | 61 --------------
sci-mathematics/glpk/glpk-4.61-r1.ebuild | 62 ---------------
12 files changed, 699 deletions(-)
diff --git a/sci-mathematics/glpk/Manifest b/sci-mathematics/glpk/Manifest
index 3c19e916d3e..e7dae3fabf9 100644
--- a/sci-mathematics/glpk/Manifest
+++ b/sci-mathematics/glpk/Manifest
@@ -1,8 +1 @@
-DIST glpk-4.45.tar.gz 3132439 BLAKE2B 1c3c8123fbb91c4d0357553ca5cbaea3b69c07f79e2353289f4ca17f7f02e06c8639257fc752a9d513481803c66ab1218ede51cf053d6d77a468bbaa208f36d8 SHA512 27089b760d89ee16c5a3332d319007af4b05e8d27df0b990311508f856a01461d8b7b40b111bbf1f3dd4d754af84000112f95349d5286e6d3e42e56226f98649
-DIST glpk-4.48.tar.gz 3488482 BLAKE2B c96c278b8eac7b79aa642106fc3563123f812546fc2e8967a107acd50f010107ea5ef2e005f18117c0ff5061cdf6c3b14eafed22827177cd6516857dc585b18f SHA512 16795e6cf4db302f25e06e5c9a660e5ed8c7b24ffc5126cde0f864e83fa77d4d61838eab4f716291d568963dddf7442a36a39425a62bd58bd00ca73dac4ffa70
-DIST glpk-4.54.tar.gz 3098202 BLAKE2B 32d4f6715e893e52982e572424e18642d80c76b5a8cefb30ee6ec49ae334f8fb3fa2e1e92fe4a90ceb048a4c02cde7248a777a5a88f797a9751777cf523840f9 SHA512 7eb815a6d8416dd9f2bb94e9a4aef493c171898404ebc6276fcc1c4f3b4244220213a2bd098707104589348080820a7cb8a717aab73ca513f05b2f9a10aea070
-DIST glpk-4.55.tar.gz 3424345 BLAKE2B cc4e7b6edeb4497c3aa41151f53c1f48070ba3b83e04ecd48dd2d51f2d464be26440213e1f21cad92159c9326e5c5472f63c5ecfd25b1dfc44e39c3bbafc9eac SHA512 a0c8ce0c850e0075098f0526db8f7584a86d5cb44d8ddefa55abf9f1f66af89f5aec19cf1cad51fc5585d8dfa50eab6ece984a038e00c472aec2ef1473eac689
-DIST glpk-4.57.tar.gz 3782998 BLAKE2B 031db9f4cc1aec933f551926fb0a65190609132de6692e3cb7f3ad4940b7b25d7f9b267cca671abc53fc803025389858557413a4a658489b6c55e2df13e507ec SHA512 1979e59b96ce359168a81b720207045916f66c5755023b02c2e197e5a713d456165d94f1e40830547dc072de865f94e3b3a4d8e66d5d15aeb93f304f1893fe48
-DIST glpk-4.60.tar.gz 4160915 BLAKE2B 26cd258701574825ce9333803fc0f1991cec62206563afb9ca0a1dec0e2b55f58661b066ae8a328d11f2bc7cb2be9c77535804d16c267b51d67a1e3696de8395 SHA512 521bc48c588318fe6075eb66b1c43465200039f64b105b4a24f9f6eb9bb4742c7ebc96750ce999f64c60d6531486476386467dd41e949f1a00cba0cf00fbe20a
-DIST glpk-4.61.tar.gz 4116291 BLAKE2B aaf67b2e6729772540887174e6241576cc2fe530074d7304eb319e852f8474a8e50f7ee0b9a7d0e2d38f08eb63484eef2b62d92e495ba0520a2715736b57fd17 SHA512 0bcf89b62a2b3f565356b7ae538c5af6f3b4283234827c4212284d4924ce93980f6971f51313f1c08790e23e860771545dc58fdb8b35405d37404589683f40a1
DIST glpk-4.63.tar.gz 4131787 BLAKE2B 791fa1a1424011668019e180fc245c0319f601255f596affe87afa0df47d9d615a8accd794d51c15bff5fe4fe6409369362f6c9e82bdde67903177b8da55e891 SHA512 3ee9b9ec5322282a9c62b2ee209fc7760383a6a764ef3816445ffb66f15ed4d00309bff1b98d50c243b58aa74f83072afde45c389799e637e11e86f4db45276c
diff --git a/sci-mathematics/glpk/files/glpk-4.52.1-mariadb-5.5.patch b/sci-mathematics/glpk/files/glpk-4.52.1-mariadb-5.5.patch
deleted file mode 100644
index 06aa8e5de95..00000000000
--- a/sci-mathematics/glpk/files/glpk-4.52.1-mariadb-5.5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- glpk-4.52.1/src/glpsql.c.orig 2014-02-05 22:14:21.487843989 +0100
-+++ glpk-4.52.1/src/glpsql.c 2014-02-05 22:14:32.764510562 +0100
-@@ -1106,8 +1106,6 @@
- #define byte_defined 1
- #endif
-
--#include <my_global.h>
--#include <my_sys.h>
- #include <mysql.h>
-
- struct db_mysql
diff --git a/sci-mathematics/glpk/files/glpk-4.54-debundle-system-libs.patch b/sci-mathematics/glpk/files/glpk-4.54-debundle-system-libs.patch
deleted file mode 100644
index a3140341a48..00000000000
--- a/sci-mathematics/glpk/files/glpk-4.54-debundle-system-libs.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-Remove suitesparse (camd,colamd) and zlib bundles
-bicatali - apr 2014
-
---- configure.ac.orig 2014-04-05 14:18:56.045148287 -0700
-+++ configure.ac 2014-04-05 14:23:24.878803309 -0700
-@@ -59,6 +59,11 @@
- 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]))
---- src/Makefile.am.orig 2014-04-05 14:19:16.401273769 -0700
-+++ src/Makefile.am 2014-04-05 14:21:56.696259485 -0700
-@@ -6,15 +6,12 @@
-
- libglpk_la_CPPFLAGS = \
- -I$(srcdir) \
---I$(srcdir)/amd \
- -I$(srcdir)/bflib \
- -I$(srcdir)/cglib \
---I$(srcdir)/colamd \
- -I$(srcdir)/env \
- -I$(srcdir)/minisat \
- -I$(srcdir)/misc \
---I$(srcdir)/proxy \
---I$(srcdir)/zlib
-+-I$(srcdir)/proxy
-
- libglpk_la_LDFLAGS = \
- -version-info 37:1:1 \
-@@ -92,18 +89,6 @@
- glpssx02.c \
- glptsp.c \
- lux.c \
--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 \
- bflib/btf.c \
- bflib/btfint.c \
- bflib/fhv.c \
-@@ -117,7 +102,6 @@
- bflib/sva.c \
- cglib/cfg.c \
- cglib/cfg1.c \
--colamd/colamd.c \
- env/alloc.c \
- env/dlsup.c \
- env/env.c \
-@@ -150,21 +134,6 @@
- misc/wclique.c \
- misc/wclique1.c \
- proxy/proxy.c \
--proxy/proxy1.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
-+proxy/proxy1.c
-
- ## eof ##
diff --git a/sci-mathematics/glpk/files/glpk-4.57-debundle-system-libs.patch b/sci-mathematics/glpk/files/glpk-4.57-debundle-system-libs.patch
deleted file mode 100644
index d9efff2bb5f..00000000000
--- a/sci-mathematics/glpk/files/glpk-4.57-debundle-system-libs.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-Remove suitesparse (camd,colamd) and zlib bundles
-bicatali - apr 2014
-Updated for 4.57 by soap (Jan 2016)
-
---- glpk-4.57/configure.ac
-+++ glpk-4.57/configure.ac
-@@ -59,6 +59,11 @@
- 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]))
---- glpk-4.57/src/Makefile.am
-+++ glpk-4.57/src/Makefile.am
-@@ -6,16 +6,13 @@
-
- libglpk_la_CPPFLAGS = \
- -I$(srcdir) \
---I$(srcdir)/amd \
- -I$(srcdir)/bflib \
- -I$(srcdir)/cglib \
---I$(srcdir)/colamd \
- -I$(srcdir)/env \
- -I$(srcdir)/minisat \
- -I$(srcdir)/misc \
- -I$(srcdir)/proxy \
---I$(srcdir)/simplex \
---I$(srcdir)/zlib
-+-I$(srcdir)/simplex
-
- libglpk_la_LDFLAGS = \
- -version-info 38:0:2 \
-@@ -90,18 +87,6 @@
- glpssx01.c \
- glpssx02.c \
- lux.c \
--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 \
- bflib/btf.c \
- bflib/btfint.c \
- bflib/fhv.c \
-@@ -115,7 +100,6 @@
- bflib/sva.c \
- cglib/cfg.c \
- cglib/cfg1.c \
--colamd/colamd.c \
- env/alloc.c \
- env/dlsup.c \
- env/env.c \
-@@ -158,21 +142,6 @@
- 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.60-debundle-system-libs.patch b/sci-mathematics/glpk/files/glpk-4.60-debundle-system-libs.patch
deleted file mode 100644
index 8790de5414f..00000000000
--- a/sci-mathematics/glpk/files/glpk-4.60-debundle-system-libs.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-Remove suitesparse (camd,colamd) and zlib bundles
-bicatali - apr 2014
-Updated for 4.57 by soap (Jan 2016)
-Updated for 4.60 by bicatali (Dec 2016)
-
---- glpk-4.60/configure.ac
-+++ glpk-4.60/configure.ac
-@@ -59,6 +59,11 @@
- 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]))
-
---- glpk-4.60/src/Makefile.am
-+++ glpk-4.60/src/Makefile.am
-@@ -6,18 +6,15 @@
-
- libglpk_la_CPPFLAGS = \
- -I$(srcdir) \
---I$(srcdir)/amd \
- -I$(srcdir)/api \
- -I$(srcdir)/bflib \
- -I$(srcdir)/cglib \
---I$(srcdir)/colamd \
- -I$(srcdir)/env \
- -I$(srcdir)/minisat \
- -I$(srcdir)/misc \
- -I$(srcdir)/mpl \
- -I$(srcdir)/proxy \
---I$(srcdir)/simplex \
---I$(srcdir)/zlib
-+-I$(srcdir)/simplex
-
- libglpk_la_LDFLAGS = \
- -version-info 41:0:1 \
-@@ -63,18 +60,6 @@
- glpssx02.c \
- lux.c \
- spv.c \
--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 \
-@@ -142,7 +127,6 @@
- cglib/gmicut.c \
- cglib/gmigen.c \
- cglib/mirgen.c \
--colamd/colamd.c \
- env/alloc.c \
- env/dlsup.c \
- env/env.c \
-@@ -195,21 +179,6 @@
- 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/glpk-4.45.ebuild b/sci-mathematics/glpk/glpk-4.45.ebuild
deleted file mode 100644
index 87a75a0c57e..00000000000
--- a/sci-mathematics/glpk/glpk-4.45.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils flag-o-matic
-
-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"
-IUSE="doc examples gmp odbc mysql static-libs"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux"
-
-RDEPEND="sys-libs/zlib
- odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
- gmp? ( dev-libs/gmp )
- mysql? ( virtual/mysql )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-4.52.1-mariadb-5.5.patch
-}
-
-src_configure() {
- local myconf="--disable-dl"
- if use mysql || use odbc; then
- myconf="--enable-dl"
- fi
-
- [[ -z $(type -P odbc-config) ]] && \
- append-cppflags $(pkg-config --cflags libiodbc)
-
- econf \
- --with-zlib \
- $(use_enable static-libs static) \
- $(use_with gmp) \
- $(use_enable odbc) \
- $(use_enable mysql) \
- ${myconf}
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
-
- dodoc AUTHORS ChangeLog NEWS README || \
- die "failed to install docs"
-
- insinto /usr/share/doc/${PF}
- if use examples; then
- emake distclean
- doins -r examples || die "failed to install examples"
- fi
- if use doc; then
- cd "${S}"/doc
- doins *.pdf notes/*.pdf || die "failed to instal djvu and pdf"
- dodoc *.txt || die "failed to install manual files"
- fi
-}
diff --git a/sci-mathematics/glpk/glpk-4.48.ebuild b/sci-mathematics/glpk/glpk-4.48.ebuild
deleted file mode 100644
index f8ce132717c..00000000000
--- a/sci-mathematics/glpk/glpk-4.48.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic toolchain-funcs autotools-utils
-
-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"
-IUSE="doc examples gmp odbc mysql static-libs"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-
-RDEPEND="
- gmp? ( dev-libs/gmp:0 )
- mysql? ( virtual/mysql )
- odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.52.1-mariadb-5.5.patch
-)
-
-src_configure() {
- local myeconfargs=(
- $(use_enable mysql)
- $(use_enable odbc)
- $(use_with gmp)
- )
- if use mysql || use odbc; then
- myeconfargs+=( --enable-dl )
- else
- myeconfargs+=( --disable-dl )
- fi
- [[ -z $(type -P odbc-config) ]] && \
- append-cppflags $($(tc-getPKG_CONFIG) --cflags libiodbc)
-
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r examples
- fi
- use doc && dodoc doc/*.pdf doc/notes/*.pdf doc/*.txt
-}
diff --git a/sci-mathematics/glpk/glpk-4.54.ebuild b/sci-mathematics/glpk/glpk-4.54.ebuild
deleted file mode 100644
index 948bf8bbcaf..00000000000
--- a/sci-mathematics/glpk/glpk-4.54.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit eutils flag-o-matic toolchain-funcs autotools-utils
-
-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/36"
-IUSE="doc examples gmp odbc mysql static-libs"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-
-RDEPEND="
- sci-libs/amd:0=
- sci-libs/colamd:=
- sys-libs/zlib:0=
- gmp? ( dev-libs/gmp:0= )
- mysql? ( virtual/mysql )
- odbc? ( || ( dev-db/libiodbc:0 dev-db/unixODBC:0 ) )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.54-debundle-system-libs.patch
-)
-
-src_configure() {
- local myeconfargs=(
- $(use_enable mysql)
- $(use_enable odbc)
- $(use_with gmp)
- )
- if use mysql || use odbc; then
- myeconfargs+=( --enable-dl )
- else
- myeconfargs+=( --disable-dl )
- fi
- [[ -z $(type -P odbc-config) ]] && \
- append-cppflags $($(tc-getPKG_CONFIG) --cflags libiodbc)
-
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install
- 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/glpk-4.55.ebuild b/sci-mathematics/glpk/glpk-4.55.ebuild
deleted file mode 100644
index 948bf8bbcaf..00000000000
--- a/sci-mathematics/glpk/glpk-4.55.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit eutils flag-o-matic toolchain-funcs autotools-utils
-
-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/36"
-IUSE="doc examples gmp odbc mysql static-libs"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-
-RDEPEND="
- sci-libs/amd:0=
- sci-libs/colamd:=
- sys-libs/zlib:0=
- gmp? ( dev-libs/gmp:0= )
- mysql? ( virtual/mysql )
- odbc? ( || ( dev-db/libiodbc:0 dev-db/unixODBC:0 ) )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.54-debundle-system-libs.patch
-)
-
-src_configure() {
- local myeconfargs=(
- $(use_enable mysql)
- $(use_enable odbc)
- $(use_with gmp)
- )
- if use mysql || use odbc; then
- myeconfargs+=( --enable-dl )
- else
- myeconfargs+=( --disable-dl )
- fi
- [[ -z $(type -P odbc-config) ]] && \
- append-cppflags $($(tc-getPKG_CONFIG) --cflags libiodbc)
-
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install
- 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/glpk-4.57.ebuild b/sci-mathematics/glpk/glpk-4.57.ebuild
deleted file mode 100644
index db5c9d1472c..00000000000
--- a/sci-mathematics/glpk/glpk-4.57.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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/36"
-IUSE="doc examples gmp odbc mysql static-libs"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-
-RDEPEND="
- sci-libs/amd:0=
- sci-libs/colamd:=
- sys-libs/zlib:0=
- gmp? ( dev-libs/gmp:0= )
- mysql? ( virtual/mysql )
- odbc? ( || ( dev-db/libiodbc:0 dev-db/unixODBC:0 ) )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${P}-debundle-system-libs.patch
-)
-
-src_prepare() {
- 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_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/glpk-4.60.ebuild b/sci-mathematics/glpk/glpk-4.60.ebuild
deleted file mode 100644
index e860582c03f..00000000000
--- a/sci-mathematics/glpk/glpk-4.60.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-
-RDEPEND="
- sci-libs/amd:0=
- sci-libs/colamd:=
- sys-libs/zlib:0=
- gmp? ( dev-libs/gmp:0= )
- mysql? ( virtual/mysql )
- odbc? ( || ( dev-db/libiodbc:0 dev-db/unixODBC:0 ) )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${P}-debundle-system-libs.patch
-)
-
-src_prepare() {
- 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_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/glpk-4.61-r1.ebuild b/sci-mathematics/glpk/glpk-4.61-r1.ebuild
deleted file mode 100644
index dfc1dfe7f6c..00000000000
--- a/sci-mathematics/glpk/glpk-4.61-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-
-RDEPEND="
- sci-libs/amd:0=
- sci-libs/colamd:=
- sys-libs/zlib:0=
- gmp? ( dev-libs/gmp:0= )
- mysql? ( virtual/mysql )
- odbc? ( || ( dev-db/libiodbc:0 dev-db/unixODBC:0 ) )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.60-debundle-system-libs.patch
-)
-
-src_prepare() {
- 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
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/, sci-mathematics/glpk/files/
@ 2017-07-27 21:19 Robin H. Johnson
0 siblings, 0 replies; 7+ messages in thread
From: Robin H. Johnson @ 2017-07-27 21:19 UTC (permalink / raw
To: gentoo-commits
commit: 15e2a359852b0253e6249d8215494123de9529cc
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 27 21:18:51 2017 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Jul 27 21:19:18 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15e2a359
sci-mathematics/glpk: bump.
Fixes: https://bugs.gentoo.org/show_bug.cgi?id=626224
Package-Manager: portage-2.3.6
sci-mathematics/glpk/Manifest | 1 +
.../files/glpk-4.63-debundle-system-libs.patch | 94 ++++++++++++++++++++++
sci-mathematics/glpk/glpk-4.63.ebuild | 62 ++++++++++++++
3 files changed, 157 insertions(+)
diff --git a/sci-mathematics/glpk/Manifest b/sci-mathematics/glpk/Manifest
index 4cd6181920b..871b1b8e1ea 100644
--- a/sci-mathematics/glpk/Manifest
+++ b/sci-mathematics/glpk/Manifest
@@ -5,3 +5,4 @@ DIST glpk-4.55.tar.gz 3424345 SHA256 37090d7f16796ec1034496e182a39d5cc8bb7c9fb5d
DIST glpk-4.57.tar.gz 3782998 SHA256 7323b2a7cc1f13e45fc845f0fdca74f4daea2af716f5ad2d4d55b41e8394275c SHA512 1979e59b96ce359168a81b720207045916f66c5755023b02c2e197e5a713d456165d94f1e40830547dc072de865f94e3b3a4d8e66d5d15aeb93f304f1893fe48 WHIRLPOOL 225760810ae9efbff31d0238dff08d966db5167e9b61a79f960d03b6d6bdaa2ed7d9b1e7608a99418d5346d3e8ddbe8b58f0d561aaacb292decf235b821fbc62
DIST glpk-4.60.tar.gz 4160915 SHA256 1356620cb0a0d33ac3411dd49d9fd40d53ece73eaec8f6b8d19a77887ff5e297 SHA512 521bc48c588318fe6075eb66b1c43465200039f64b105b4a24f9f6eb9bb4742c7ebc96750ce999f64c60d6531486476386467dd41e949f1a00cba0cf00fbe20a WHIRLPOOL dfde976f9a32ba1751d1a0748c21023e0df802a1f22501c70091cbfb273bde8b73951eceb2a0768bc5634d6786c1cdb109e36af78e72ac7825fa9743737721f4
DIST glpk-4.61.tar.gz 4116291 SHA256 9866de41777782d4ce21da11b88573b66bb7858574f89c28be6967ac22dfaba9 SHA512 0bcf89b62a2b3f565356b7ae538c5af6f3b4283234827c4212284d4924ce93980f6971f51313f1c08790e23e860771545dc58fdb8b35405d37404589683f40a1 WHIRLPOOL 01228c555ba7d17668a35a80bdf37dba00a1a105291288aa5ebef43c3ea3999e81042e0f98b5bfbfd7d44804a79014281120aaf10ca181be1b0615b97925407c
+DIST glpk-4.63.tar.gz 4131787 SHA256 914d27f1a51c2bf4a51f1bd4a507f875fcca99db7b219380b836a25b29b3e7f6 SHA512 3ee9b9ec5322282a9c62b2ee209fc7760383a6a764ef3816445ffb66f15ed4d00309bff1b98d50c243b58aa74f83072afde45c389799e637e11e86f4db45276c WHIRLPOOL 30facc4776e3db4232ff2924452ee0601bda78b3888f162a12e84af2f2232fbcbd986a9e849a6ce38fa19688c45eb6c6852ca76cc277ea5324e8a55fe899088e
diff --git a/sci-mathematics/glpk/files/glpk-4.63-debundle-system-libs.patch b/sci-mathematics/glpk/files/glpk-4.63-debundle-system-libs.patch
new file mode 100644
index 00000000000..e836219d0ad
--- /dev/null
+++ b/sci-mathematics/glpk/files/glpk-4.63-debundle-system-libs.patch
@@ -0,0 +1,94 @@
+Remove suitesparse (camd,colamd) and zlib bundles
+bicatali - apr 2014
+Updated for 4.57 by soap (Jan 2016)
+Updated for 4.60 by bicatali (Dec 2016)
+Updated for 4.63 by bicatali (Jul 2017)
+
+diff -Nuar --exclude '*.orig' --exclude '*.rej' --exclude '*~' glpk-4.63.orig/configure.ac glpk-4.63/configure.ac
+--- glpk-4.63.orig/configure.ac 2017-07-25 00:00:00.000000000 -0700
++++ glpk-4.63/configure.ac 2017-07-27 14:10:47.986520907 -0700
+@@ -69,6 +69,11 @@
+ 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 -Nuar --exclude '*.orig' --exclude '*.rej' --exclude '*~' glpk-4.63.orig/src/Makefile.am glpk-4.63/src/Makefile.am
+--- glpk-4.63.orig/src/Makefile.am 2017-07-25 00:00:00.000000000 -0700
++++ glpk-4.63/src/Makefile.am 2017-07-27 14:11:30.841536062 -0700
+@@ -6,18 +6,15 @@
+
+ libglpk_la_CPPFLAGS = \
+ -I$(srcdir) \
+--I$(srcdir)/amd \
+ -I$(srcdir)/api \
+ -I$(srcdir)/bflib \
+ -I$(srcdir)/cglib \
+--I$(srcdir)/colamd \
+ -I$(srcdir)/env \
+ -I$(srcdir)/minisat \
+ -I$(srcdir)/misc \
+ -I$(srcdir)/mpl \
+ -I$(srcdir)/proxy \
+--I$(srcdir)/simplex \
+--I$(srcdir)/zlib
++-I$(srcdir)/simplex
+
+ libglpk_la_LDFLAGS = \
+ -version-info 42:2:2 \
+@@ -57,18 +54,6 @@
+ glpssx01.c \
+ glpssx02.c \
+ lux.c \
+-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 \
+@@ -142,7 +127,6 @@
+ cglib/gmigen.c \
+ cglib/mirgen.c \
+ cglib/spv.c \
+-colamd/colamd.c \
+ env/alloc.c \
+ env/dlsup.c \
+ env/env.c \
+@@ -196,21 +180,6 @@
+ 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/glpk-4.63.ebuild b/sci-mathematics/glpk/glpk-4.63.ebuild
new file mode 100644
index 00000000000..9c15f085e03
--- /dev/null
+++ b/sci-mathematics/glpk/glpk-4.63.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+
+RDEPEND="
+ sci-libs/amd:0=
+ sci-libs/colamd:=
+ sys-libs/zlib:0=
+ gmp? ( dev-libs/gmp:0= )
+ mysql? ( virtual/mysql )
+ odbc? ( || ( dev-db/libiodbc:0 dev-db/unixODBC:0 ) )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.63-debundle-system-libs.patch
+)
+
+src_prepare() {
+ 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
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/, sci-mathematics/glpk/files/
@ 2016-12-12 6:22 Sebastien Fabbro
0 siblings, 0 replies; 7+ messages in thread
From: Sebastien Fabbro @ 2016-12-12 6:22 UTC (permalink / raw
To: gentoo-commits
commit: 73177f3314cad1552a6e971bffba67f1e4cfb416
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 12 04:28:11 2016 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Mon Dec 12 06:22:24 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73177f33
sci-mathematics/glpk: version bump to 4.60
Adapted patch to debundle zlib and suitesparse
Package-Manager: portage-2.3.3
sci-mathematics/glpk/Manifest | 1 +
.../files/glpk-4.60-debundle-system-libs.patch | 92 ++++++++++++++++++++++
sci-mathematics/glpk/glpk-4.60.ebuild | 62 +++++++++++++++
3 files changed, 155 insertions(+)
diff --git a/sci-mathematics/glpk/Manifest b/sci-mathematics/glpk/Manifest
index 3695385..01f8b29 100644
--- a/sci-mathematics/glpk/Manifest
+++ b/sci-mathematics/glpk/Manifest
@@ -3,3 +3,4 @@ DIST glpk-4.48.tar.gz 3488482 SHA256 abc2c8f895b20a91cdfcfc04367a0bc8677daf8b4ec
DIST glpk-4.54.tar.gz 3098202 SHA256 ab72c8078402d34d176eda18c3f9a6ef006e223d530897a4d1d73fb4ad12f9a1 SHA512 7eb815a6d8416dd9f2bb94e9a4aef493c171898404ebc6276fcc1c4f3b4244220213a2bd098707104589348080820a7cb8a717aab73ca513f05b2f9a10aea070 WHIRLPOOL 56ff0baf5e98fdc8e12e4d4db664a4a287dc358dd75839d90d463c04e3e7d97b1023ea93217dd642f6737cccddecdb8f534980e48f8893aff395dc430622de69
DIST glpk-4.55.tar.gz 3424345 SHA256 37090d7f16796ec1034496e182a39d5cc8bb7c9fb5dc48a38b13d620bf2b1de7 SHA512 a0c8ce0c850e0075098f0526db8f7584a86d5cb44d8ddefa55abf9f1f66af89f5aec19cf1cad51fc5585d8dfa50eab6ece984a038e00c472aec2ef1473eac689 WHIRLPOOL 4b3f543c862008dd09e867947c0383eb2f482f63b8fe30d9f682ccc7d0af1693af043c8cd63362be1bc736ef39393d59cdf0196326b08c7f48495bb5b5937487
DIST glpk-4.57.tar.gz 3782998 SHA256 7323b2a7cc1f13e45fc845f0fdca74f4daea2af716f5ad2d4d55b41e8394275c SHA512 1979e59b96ce359168a81b720207045916f66c5755023b02c2e197e5a713d456165d94f1e40830547dc072de865f94e3b3a4d8e66d5d15aeb93f304f1893fe48 WHIRLPOOL 225760810ae9efbff31d0238dff08d966db5167e9b61a79f960d03b6d6bdaa2ed7d9b1e7608a99418d5346d3e8ddbe8b58f0d561aaacb292decf235b821fbc62
+DIST glpk-4.60.tar.gz 4160915 SHA256 1356620cb0a0d33ac3411dd49d9fd40d53ece73eaec8f6b8d19a77887ff5e297 SHA512 521bc48c588318fe6075eb66b1c43465200039f64b105b4a24f9f6eb9bb4742c7ebc96750ce999f64c60d6531486476386467dd41e949f1a00cba0cf00fbe20a WHIRLPOOL dfde976f9a32ba1751d1a0748c21023e0df802a1f22501c70091cbfb273bde8b73951eceb2a0768bc5634d6786c1cdb109e36af78e72ac7825fa9743737721f4
diff --git a/sci-mathematics/glpk/files/glpk-4.60-debundle-system-libs.patch b/sci-mathematics/glpk/files/glpk-4.60-debundle-system-libs.patch
new file mode 100644
index 00000000..8790de5
--- /dev/null
+++ b/sci-mathematics/glpk/files/glpk-4.60-debundle-system-libs.patch
@@ -0,0 +1,92 @@
+Remove suitesparse (camd,colamd) and zlib bundles
+bicatali - apr 2014
+Updated for 4.57 by soap (Jan 2016)
+Updated for 4.60 by bicatali (Dec 2016)
+
+--- glpk-4.60/configure.ac
++++ glpk-4.60/configure.ac
+@@ -59,6 +59,11 @@
+ 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]))
+
+--- glpk-4.60/src/Makefile.am
++++ glpk-4.60/src/Makefile.am
+@@ -6,18 +6,15 @@
+
+ libglpk_la_CPPFLAGS = \
+ -I$(srcdir) \
+--I$(srcdir)/amd \
+ -I$(srcdir)/api \
+ -I$(srcdir)/bflib \
+ -I$(srcdir)/cglib \
+--I$(srcdir)/colamd \
+ -I$(srcdir)/env \
+ -I$(srcdir)/minisat \
+ -I$(srcdir)/misc \
+ -I$(srcdir)/mpl \
+ -I$(srcdir)/proxy \
+--I$(srcdir)/simplex \
+--I$(srcdir)/zlib
++-I$(srcdir)/simplex
+
+ libglpk_la_LDFLAGS = \
+ -version-info 41:0:1 \
+@@ -63,18 +60,6 @@
+ glpssx02.c \
+ lux.c \
+ spv.c \
+-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 \
+@@ -142,7 +127,6 @@
+ cglib/gmicut.c \
+ cglib/gmigen.c \
+ cglib/mirgen.c \
+-colamd/colamd.c \
+ env/alloc.c \
+ env/dlsup.c \
+ env/env.c \
+@@ -195,21 +179,6 @@
+ 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/glpk-4.60.ebuild b/sci-mathematics/glpk/glpk-4.60.ebuild
new file mode 100644
index 00000000..23b3767
--- /dev/null
+++ b/sci-mathematics/glpk/glpk-4.60.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+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="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+
+RDEPEND="
+ sci-libs/amd:0=
+ sci-libs/colamd:=
+ sys-libs/zlib:0=
+ gmp? ( dev-libs/gmp:0= )
+ mysql? ( virtual/mysql )
+ odbc? ( || ( dev-db/libiodbc:0 dev-db/unixODBC:0 ) )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-debundle-system-libs.patch
+)
+
+src_prepare() {
+ 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_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
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-10-24 14:36 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-24 14:36 [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/, sci-mathematics/glpk/files/ Michael Orlitzky
-- strict thread matches above, loose matches on Subject: below --
2021-11-02 23:12 Michael Orlitzky
2020-04-13 17:38 Michael Orlitzky
2020-03-07 2:23 Michael Orlitzky
2018-04-18 16:44 David Seifert
2017-07-27 21:19 Robin H. Johnson
2016-12-12 6:22 Sebastien Fabbro
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox