diff src/glpk-1-fixes.patch @ 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 5a02aaaff885
children 3858aa1d5ef8
line wrap: on
line diff
--- 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 = \