changeset 4279:060d6cafa0a6

glpk: update to 4.60 * src/glpk.mk: update version, checksum * src/glpk-1-fixes.patch: removed * src/glpk.mk: remove glpk-1-fixes.patch
author John D
date Sat, 17 Dec 2016 18:56:48 -0500
parents 6503581519fd
children 503eebae5f78
files dist-files.mk src/glpk-1-fixes.patch src/glpk.mk
diffstat 3 files changed, 4 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Fri Dec 16 13:13:50 2016 -0500
+++ b/dist-files.mk	Sat Dec 17 18:56:48 2016 -0500
@@ -130,7 +130,6 @@
   glew.mk \
   glib.mk \
   glibmm.mk \
-  glpk-1-fixes.patch \
   glpk.mk \
   gmp.mk \
   gnuplot-1-fixes.patch \
--- a/src/glpk-1-fixes.patch	Fri Dec 16 13:13:50 2016 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-diff -ur glpk-4.55.orig/src/Makefile.am glpk-4.55/src/Makefile.am
---- glpk-4.55.orig/src/Makefile.am	2015-02-16 13:30:31.791250808 -0500
-+++ glpk-4.55/src/Makefile.am	2015-02-16 13:33:44.773042081 -0500
-@@ -18,6 +18,7 @@
- 
- libglpk_la_LDFLAGS = \
- -version-info 37:2:1 \
-+-no-undefined \
- -export-symbols-regex '^glp_*'
- 
- libglpk_la_SOURCES = \
--- a/src/glpk.mk	Fri Dec 16 13:13:50 2016 -0500
+++ b/src/glpk.mk	Sat Dec 17 18:56:48 2016 -0500
@@ -3,12 +3,12 @@
 
 PKG             := glpk
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 4.55
-$(PKG)_CHECKSUM := 893058aada022a8dfc63c675ebcd7e7e86a3a363
+$(PKG)_VERSION  := 4.60
+$(PKG)_CHECKSUM := 4e55a3d2aa38b19c5bdd8a195738dbaf44e91e90
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := glpk-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := ftp://ftp.gnu.org/gnu/glpk/$($(PKG)_FILE)
-$(PKG)_DEPS     :=
+$(PKG)_DEPS     := gmp
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://ftp.gnu.org/gnu/glpk/?C=M;O=D' | \
@@ -23,6 +23,7 @@
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
+	--with-gmp \
         --prefix='$(HOST_PREFIX)' && $(CONFIGURE_POST_HOOK)
     $(MAKE) -C '$(1)/.build' -j '$(JOBS)'
     $(MAKE) -C '$(1)/.build' -j 1 install DESTDIR='$(3)'