Mercurial > mxe-octave
changeset 2948:5a02aaaff885
update libtool usage for glpk
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 07 Jan 2013 18:32:57 -0500 |
| parents | e18f5b46e77c |
| children | e94cce61e308 |
| files | src/glpk-1-fixes.patch src/glpk.mk |
| diffstat | 2 files changed, 26 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/glpk-1-fixes.patch Mon Jan 07 18:32:57 2013 -0500 @@ -0,0 +1,24 @@ +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 +@@ -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 -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 @@ + + lib_LTLIBRARIES = libglpk.la + +-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 Mon Jan 07 18:24:31 2013 -0500 +++ b/src/glpk.mk Mon Jan 07 18:32:57 2013 -0500 @@ -15,21 +15,12 @@ endef define $(PKG)_BUILD - # build GCC and support libraries + cd '$(1)' && aclocal && libtoolize && autoreconf mkdir '$(1)/.build' cd '$(1)/.build' && '$(1)/configure' \ --host='$(TARGET)' \ --build="`config.guess`" \ - --disable-shared \ + $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install - - if [ $(BUILD_SHARED) = yes ]; then \ - $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(PREFIX)/$(TARGET)/lib/libglpk.a'; \ - $(INSTALL) -d '$(PREFIX)/$(TARGET)/bin'; \ - $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libglpk.dll.a' '$(PREFIX)/$(TARGET)/lib/libglpk.dll.a'; \ - $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libglpk.dll' '$(PREFIX)/$(TARGET)/bin/libglpk.dll'; \ - rm -f '$(PREFIX)/$(TARGET)/lib/libglpk.dll'; \ - rm -f '$(PREFIX)/$(TARGET)/lib/libglpk.la'; \ - fi endef