changeset 3678:3858aa1d5ef8

glpk: update to v4.54 * src/glpk.mk: update version * src/gplk-1-fixes.patch: update patch
author John Donoghue
date Tue, 05 Aug 2014 07:32:21 -0400
parents 24585d4f70bb
children 1f3183556bcf
files src/glpk-1-fixes.patch src/glpk.mk
diffstat 2 files changed, 10 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/src/glpk-1-fixes.patch	Tue Aug 05 07:08:53 2014 -0400
+++ b/src/glpk-1-fixes.patch	Tue Aug 05 07:32:21 2014 -0400
@@ -1,23 +1,11 @@
-diff -ur glpk-4.52.1.orig/configure.ac glpk-4.52.1/configure.ac
---- glpk-4.52.1.orig/configure.ac	2013-10-18 07:53:54 -0400
-+++ glpk-4.52.1/configure.ac	2013-10-18 08:00:53 -0400
-@@ -54,7 +54,7 @@
- dnl Check for programs
- AC_PROG_CC
- AC_PROG_INSTALL
--AC_PROG_LIBTOOL
-+LT_INIT([win32-dll])
- 
- dnl Check for math library
- AC_CHECK_LIB([m], [exp])
-diff -ur glpk-4.52.1.orig/src/Makefile.am glpk-4.52.1/src/Makefile.am
---- glpk-4.52.1.orig/src/Makefile.am	2013-10-18 07:53:54 -0400
-+++ glpk-4.52.1/src/Makefile.am	2013-10-18 08:02:15 -0400
-@@ -17,6 +17,7 @@
- -I$(srcdir)/zlib
+diff -ur glpk-4.54.orig/src/Makefile.am glpk-4.54/src/Makefile.am
+--- glpk-4.54.orig/src/Makefile.am	2014-08-05 07:17:56 -0400
++++ glpk-4.54/src/Makefile.am	2014-08-05 07:19:02 -0400
+@@ -18,6 +18,7 @@
  
  libglpk_la_LDFLAGS = \
+ -version-info 37:1:1 \
 +-no-undefined \
- -version-info 36:1:0 \
  -export-symbols-regex '^glp_*'
  
+ libglpk_la_SOURCES = \
--- a/src/glpk.mk	Tue Aug 05 07:08:53 2014 -0400
+++ b/src/glpk.mk	Tue Aug 05 07:32:21 2014 -0400
@@ -3,8 +3,8 @@
 
 PKG             := glpk
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 4.52.1
-$(PKG)_CHECKSUM := 63fd6788f95adb52789767b19e38cfb58dda331e
+$(PKG)_VERSION  := 4.54
+$(PKG)_CHECKSUM := 69d9c5d83271d34de1a58d2de2f7ababab975492
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := glpk-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := ftp://ftp.gnu.org/gnu/glpk/$($(PKG)_FILE)
@@ -23,5 +23,6 @@
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' && $(CONFIGURE_POST_HOOK)
-    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)'
+    $(MAKE) -C '$(1)/.build' -j 1 install DESTDIR='$(3)'
 endef