Mercurial > mxe-octave
changeset 3270:7ecd056f09a6
Update glpk to 4.52.1
* index.html: update glpk-version to 5.52.1
* src/glpk.ml: update checksum.
* src/glpk-1-fixes.patch: update for latest sources.
| author | John Donoghue <john.donoghue@ieee.org> |
|---|---|
| date | Thu, 17 Oct 2013 20:07:27 -0400 |
| parents | 73f492e59b3f |
| children | 17b6f55e42c5 |
| files | index.html src/glpk-1-fixes.patch src/glpk.mk |
| diffstat | 3 files changed, 14 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/index.html Fri Oct 18 18:03:15 2013 -0400 +++ b/index.html Thu Oct 17 20:07:27 2013 -0400 @@ -1278,7 +1278,7 @@ </tr> <tr> <td id="glpk-package">glpk</td> - <td id="glpk-version">4.47</td> + <td id="glpk-version">4.52.1<td> <td id="glpk-website"><a href="http://www.gnu.org/software/glpk/">GLPK</a></td> </tr> <tr>
--- a/src/glpk-1-fixes.patch Fri Oct 18 18:03:15 2013 -0400 +++ b/src/glpk-1-fixes.patch Thu Oct 17 20:07:27 2013 -0400 @@ -1,6 +1,6 @@ -diff -rNu a/configure.ac b/configure.ac ---- a/configure.ac 2011-09-09 05:00:00.000000000 -0400 -+++ b/configure.ac 2013-01-07 18:27:28.391981562 -0500 +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 @@ -10,15 +10,14 @@ dnl Check for math library AC_CHECK_LIB([m], [exp]) -diff -rNu a/src/Makefile.am b/src/Makefile.am ---- a/src/Makefile.am 2011-09-09 05:00:00.000000000 -0400 -+++ b/src/Makefile.am 2013-01-07 18:27:50.823225245 -0500 -@@ -4,7 +4,7 @@ +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 - lib_LTLIBRARIES = libglpk.la + libglpk_la_LDFLAGS = \ ++-no-undefined \ + -version-info 36:1:0 \ + -export-symbols-regex '^glp_*' --libglpk_la_LDFLAGS = -version-info 32:0:32 \ -+libglpk_la_LDFLAGS = -no-undefined -version-info 32:0:32 \ - -export-symbols-regex '^(glp_|_glp_lpx_).*' - - libglpk_la_SOURCES = \
--- a/src/glpk.mk Fri Oct 18 18:03:15 2013 -0400 +++ b/src/glpk.mk Thu Oct 17 20:07:27 2013 -0400 @@ -3,7 +3,7 @@ PKG := glpk $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 35e16d3167389b6bc75eb51b4b48590db59f789c +$(PKG)_CHECKSUM := 63fd6788f95adb52789767b19e38cfb58dda331e $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := glpk-$($(PKG)_VERSION).tar.gz $(PKG)_URL := ftp://ftp.gnu.org/gnu/glpk/$($(PKG)_FILE)