Mercurial > mxe-octave

changeset 1386:0f61e783e13a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix build issues of packages: lapack suitesparse
author Volker Grabsch <vog@notjusthosting.com>
date Wed, 17 Nov 2010 02:59:17 +0100
parents 08b296ec290e
children 51542a2e8726
files src/lapack.mk src/suitesparse.mk
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/lapack.mk	Wed Nov 17 00:52:47 2010 +0100
+++ b/src/lapack.mk	Wed Nov 17 02:59:17 2010 +0100
@@ -25,7 +25,7 @@
     $(SED) -i 's, ar, $(TARGET)-ar,g'           '$(1)/make.inc'
     $(SED) -i 's, ranlib, $(TARGET)-ranlib,g'   '$(1)/make.inc'
 
-    $(MAKE) -C '$(1)' -j '$(JOBS)' lapacklib
+    $(MAKE) -C '$(1)/SRC' -j '$(JOBS)'
     $(INSTALL) -d                            '$(PREFIX)/$(TARGET)/lib'
     $(INSTALL) -m664 '$(1)/lapack_MINGW32.a' '$(PREFIX)/$(TARGET)/lib/liblapack.a'
 endef
--- a/src/suitesparse.mk	Wed Nov 17 00:52:47 2010 +0100
+++ b/src/suitesparse.mk	Wed Nov 17 02:59:17 2010 +0100
@@ -33,9 +33,9 @@
     # gfortran does not need libg2c
     $(SED) -i 's,-lg2c,,' '$(1)/UFconfig/UFconfig.mk'
 
-    # exclude the demos from building in order to avoid the _rand48 problems
-    $(SED) -i 's,( cd Demo ; $$(MAKE) ),#( cd Demo ; $$(MAKE) ),' '$(1)/CHOLMOD/Makefile'
-    $(SED) -i 's,( cd Demo ; $$(MAKE) ),#( cd Demo ; $$(MAKE) ),' '$(1)/SPQR/Makefile'
+    # exclude demos
+    find '$(1)' -name 'Makefile' \
+        -exec $(SED) -i 's,( cd Demo,#( cd Demo,' {} \;
 
     # build all
     $(MAKE) -C '$(1)' -j '$(JOBS)'