diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /sci-mathematics/glpk/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'sci-mathematics/glpk/files')
3 files changed, 184 insertions, 0 deletions
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 new file mode 100644 index 000000000000..06aa8e5de95c --- /dev/null +++ b/sci-mathematics/glpk/files/glpk-4.52.1-mariadb-5.5.patch @@ -0,0 +1,11 @@ +--- 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.53-debundle-system-libs.patch b/sci-mathematics/glpk/files/glpk-4.53-debundle-system-libs.patch new file mode 100644 index 000000000000..326e61301541 --- /dev/null +++ b/sci-mathematics/glpk/files/glpk-4.53-debundle-system-libs.patch @@ -0,0 +1,87 @@ +Remove suitesparse (camd,colamd) and zlib bundles + +--- configure.ac.orig 2014-03-24 10:40:24.406906149 -0700 ++++ configure.ac 2014-03-24 10:41:15.637207696 -0700 +@@ -140,6 +140,13 @@ + AC_MSG_RESULT([no]) + fi + ++AC_CHECK_LIB([amd], [amd_1]) ++AC_CHECK_LIB([colamd], [colamd]) ++ ++AC_CHECK_HEADER([amd.h]) ++ ++AC_CHECK_LIB([z], [gzopen]) ++ + AC_CONFIG_FILES( + [src/Makefile examples/Makefile Makefile]) + AC_OUTPUT +--- src/Makefile.am.orig 2014-03-24 10:40:24.413906191 -0700 ++++ src/Makefile.am 2014-03-24 10:41:15.636207690 -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:0:1 \ +@@ -93,18 +90,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/fhv.c \ + bflib/fhvint.c \ + bflib/ifu.c \ +@@ -114,7 +99,6 @@ + bflib/sva.c \ + cglib/cfg.c \ + cglib/cfg1.c \ +-colamd/colamd.c \ + env/alloc.c \ + env/dlsup.c \ + env/env.c \ +@@ -147,21 +131,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.54-debundle-system-libs.patch b/sci-mathematics/glpk/files/glpk-4.54-debundle-system-libs.patch new file mode 100644 index 000000000000..a3140341a483 --- /dev/null +++ b/sci-mathematics/glpk/files/glpk-4.54-debundle-system-libs.patch @@ -0,0 +1,86 @@ +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 ## |