Mercurial > mxe-octave
changeset 2872:eb2f17fbd971
Include qrupdate as a dependency of Octave
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 28 Nov 2012 15:26:38 -0500 |
parents | b7c77abd9273 |
children | 43a1c4d36636 |
files | index.html src/octave.mk src/qrupdate-1-fixes.patch src/qrupdate.mk |
diffstat | 4 files changed, 56 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/index.html Wed Nov 28 15:38:12 2012 -0500 +++ b/index.html Wed Nov 28 15:26:38 2012 -0500 @@ -1819,6 +1819,11 @@ <td id="qjson-website"><a href="http://qjson.sourceforge.net/">QJson</a></td> </tr> <tr> + <td id="qrupdate-package">qrupdate</td> + <td id="qrupdate-version">1.1.2</td> + <td id="qrupdate-website"><a href="http://sourceforge.net/projects/qrupdate/">qrupdate</a></td> + </tr> + <tr> <td id="qt-package">qt</td> <td id="qt-version">4.8.3</td> <td id="qt-website"><a href="http://qt.nokia.com/">Qt</a></td>
--- a/src/octave.mk Wed Nov 28 15:38:12 2012 -0500 +++ b/src/octave.mk Wed Nov 28 15:26:38 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 glpk graphicsmagick lapack pcre readline suitesparse zlib +$(PKG)_DEPS := blas curl fltk gcc glpk graphicsmagick lapack pcre qrupdate readline suitesparse zlib define $(PKG)_UPDATE echo 'Warning: Updates are temporarily disabled for package octave.' >&2;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/qrupdate-1-fixes.patch Wed Nov 28 15:26:38 2012 -0500 @@ -0,0 +1,24 @@ +diff -uNr a/Makeconf b/Makeconf +--- a/Makeconf 2010-01-19 06:35:49.000000000 -0500 ++++ b/Makeconf 2012-11-28 14:58:55.778726522 -0500 +@@ -5,6 +5,8 @@ + # set if you need shared library + FPICFLAGS=-fPIC + ++AR=ar ++ + # BLAS library (only required for tests) + BLAS=-lblas + # LAPACK library (only required for tests) +diff -uNr a/src/Makefile b/src/Makefile +--- a/src/Makefile 2010-01-19 06:35:49.000000000 -0500 ++++ b/src/Makefile 2012-11-28 14:58:45.535085046 -0500 +@@ -44,7 +44,7 @@ + solib: ../libqrupdate$(SOEXT) + + ../libqrupdate.a: $(OBJS) +- ar -cr $@ $(OBJS) ++ $(AR) -cr $@ $(OBJS) + + ../libqrupdate.so: $(OBJS) + $(FC) $(FFLAGS) -shared -o $@ -Wl,-soname=libqrupdate.so.$(MAJOR) $(OBJS) \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/qrupdate.mk Wed Nov 28 15:26:38 2012 -0500 @@ -0,0 +1,26 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := qrupdate +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := f7403b646ace20f4a2b080b4933a1e9152fac526 +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := qrupdate-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := http://sourceforge.net/projects/qrupdate/files/$($(PKG)_FILE) +$(PKG)_DEPS := blas lapack + +define $(PKG)_UPDATE + echo 'Warning: Updates are temporarily disabled for package qrupdate.' >&2; + echo $(qrupdate_VERSION) +endef + +define $(PKG)_BUILD + $(MAKE) FC=$(TARGET)-gfortran AR=$(TARGET)-ar PREFIX=$(PREFIX)/$(TARGET) -C '$(1)' -j '$(JOBS)' lib install-staticlib + + if [ $(BUILD_SHARED) = yes ]; then \ + $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gfortran' '$(1)/libqrupdate.a' -llapack -lblas; \ + $(INSTALL) -d '$(PREFIX)/$(TARGET)/bin'; \ + $(INSTALL) -m644 '$(1)/libqrupdate.dll.a' '$(PREFIX)/$(TARGET)/lib/libqrupdate.dll.a'; \ + $(INSTALL) -m644 '$(1)/libqrupdate.dll' '$(PREFIX)/$(TARGET)/bin/libqrupdate.dll'; \ + fi +endef