Mercurial > mxe-octave

comparison src/glpk-1-fixes.patch @ 3270:7ecd056f09a6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
3269:73f492e59b3f 3270:7ecd056f09a6
1 diff -rNu a/configure.ac b/configure.ac 1 diff -ur glpk-4.52.1.orig/configure.ac glpk-4.52.1/configure.ac
2 --- a/configure.ac 2011-09-09 05:00:00.000000000 -0400 2 --- glpk-4.52.1.orig/configure.ac 2013-10-18 07:53:54 -0400
3 +++ b/configure.ac 2013-01-07 18:27:28.391981562 -0500 3 +++ glpk-4.52.1/configure.ac 2013-10-18 08:00:53 -0400
4 @@ -54,7 +54,7 @@ 4 @@ -54,7 +54,7 @@
5 dnl Check for programs 5 dnl Check for programs
6 AC_PROG_CC 6 AC_PROG_CC
7 AC_PROG_INSTALL 7 AC_PROG_INSTALL
8 -AC_PROG_LIBTOOL 8 -AC_PROG_LIBTOOL
9 +LT_INIT([win32-dll]) 9 +LT_INIT([win32-dll])
10 10
11 dnl Check for math library 11 dnl Check for math library
12 AC_CHECK_LIB([m], [exp]) 12 AC_CHECK_LIB([m], [exp])
13 diff -rNu a/src/Makefile.am b/src/Makefile.am 13 diff -ur glpk-4.52.1.orig/src/Makefile.am glpk-4.52.1/src/Makefile.am
14 --- a/src/Makefile.am 2011-09-09 05:00:00.000000000 -0400 14 --- glpk-4.52.1.orig/src/Makefile.am 2013-10-18 07:53:54 -0400
15 +++ b/src/Makefile.am 2013-01-07 18:27:50.823225245 -0500 15 +++ glpk-4.52.1/src/Makefile.am 2013-10-18 08:02:15 -0400
16 @@ -4,7 +4,7 @@ 16 @@ -17,6 +17,7 @@
17 -I$(srcdir)/zlib
17 18
18 lib_LTLIBRARIES = libglpk.la 19 libglpk_la_LDFLAGS = \
20 +-no-undefined \
21 -version-info 36:1:0 \
22 -export-symbols-regex '^glp_*'
19 23
20 -libglpk_la_LDFLAGS = -version-info 32:0:32 \
21 +libglpk_la_LDFLAGS = -no-undefined -version-info 32:0:32 \
22 -export-symbols-regex '^(glp_|_glp_lpx_).*'
23
24 libglpk_la_SOURCES = \