[gentoo-commits] gentoo-x86 commit in sci-mathematics/glpk/files: glpk-4.53-debundle-system-libs.patch

[Sebastien Fabbro (bicatali)]

bicatali    14/03/24 17:46:25

  Added:                glpk-4.53-debundle-system-libs.patch
  Log:
  Version bump
  
  (Portage version: 2.2.8-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)

Revision  Changes    Path
1.1                  sci-mathematics/glpk/files/glpk-4.53-debundle-system-libs.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/glpk/files/glpk-4.53-debundle-system-libs.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/glpk/files/glpk-4.53-debundle-system-libs.patch?rev=1.1&content-type=text/plain

Index: glpk-4.53-debundle-system-libs.patch
===================================================================
Remove suitesparse (camd,colamd) and zlib bundles

diff -Nur glpk-4.53.orig/configure.ac glpk-4.53/configure.ac
--- glpk-4.53.orig/configure.ac	2014-03-24 10:40:24.406906149 -0700
+++ glpk-4.53/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
diff -Nur glpk-4.53.orig/src/Makefile.am glpk-4.53/src/Makefile.am
--- glpk-4.53.orig/src/Makefile.am	2014-03-24 10:40:24.413906191 -0700
+++ glpk-4.53/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 ##