# HG changeset patch # User John W. Eaton # Date 1354135092 18000 # Node ID b7c77abd92731c50ed0a7874b9d4117b2a4ecd09 # Parent 751d620bdcefe024b01b9da8b247bc57224cd1dd Include glpk as a dependency of Octave diff -r 751d620bdcef -r b7c77abd9273 index.html --- a/index.html Wed Nov 28 10:34:35 2012 -0500 +++ b/index.html Wed Nov 28 15:38:12 2012 -0500 @@ -1179,6 +1179,11 @@ GLibmm + glpk + 4.47 + GLPK + + gmp 5.0.5 GMP diff -r 751d620bdcef -r b7c77abd9273 src/glpk.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/glpk.mk Wed Nov 28 15:38:12 2012 -0500 @@ -0,0 +1,34 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := glpk +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := 35e16d3167389b6bc75eb51b4b48590db59f789c +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := glpk-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/glpk/glpk/$($(PKG)_FILE) +$(PKG)_DEPS := gcc + +define $(PKG)_UPDATE + echo 'Warning: Updates are temporarily disabled for package glpk.' >&2; + echo $(glpk_VERSION) +endef + +define $(PKG)_BUILD + # build GCC and support libraries + mkdir '$(1)/.build' + cd '$(1)/.build' && '$(1)/configure' \ + --host='$(TARGET)' \ + --build="`config.guess`" \ + --disable-shared \ + --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) -m644 '$(PREFIX)/$(TARGET)/lib/libglpk.dll.a' '$(PREFIX)/$(TARGET)/lib/libglpk.dll.a'; \ + $(INSTALL) -m644 '$(PREFIX)/$(TARGET)/lib/libglpk.dll' '$(PREFIX)/$(TARGET)/bin/libglpk.dll'; \ + rm -f '$(PREFIX)/$(TARGET)/lib/libglpk.dll'; \ + fi +endef diff -r 751d620bdcef -r b7c77abd9273 src/octave.mk --- a/src/octave.mk Wed Nov 28 10:34:35 2012 -0500 +++ b/src/octave.mk Wed Nov 28 15:38:12 2012 -0500 @@ -6,7 +6,7 @@ $(PKG)_CHECKSUM := 1ea936554aaabaabb747a4fcf98ecfbbfb265656 $(PKG)_FILE := octave-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://jweaton.org/$($(PKG)_FILE) -$(PKG)_DEPS := blas curl fltk gcc graphicsmagick lapack pcre readline suitesparse zlib +$(PKG)_DEPS := blas curl fltk gcc glpk graphicsmagick lapack pcre readline suitesparse zlib define $(PKG)_UPDATE echo 'Warning: Updates are temporarily disabled for package octave.' >&2;