Mercurial > mxe-octave

changeset 1377:948166ab4657

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build package metis separately, don't build it inline with package suitesparse
author Volker Grabsch <vog@notjusthosting.com>
date Tue, 16 Nov 2010 19:53:44 +0100
parents 896bc60de2a9
children 642e99b3b4fb
files src/metis.mk src/suitesparse.mk
diffstat 2 files changed, 4 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/src/metis.mk	Tue Nov 16 19:13:33 2010 +0100
+++ b/src/metis.mk	Tue Nov 16 19:53:44 2010 +0100
@@ -18,10 +18,7 @@
     head -1
 endef
 
-define $(PKG)_NO_BUILD
-    # Don't build metis here, build inline with suitesparse instead
-    # since it looks in an odd location for the headers
-    # Change this to $(PKG)_BUILD to actually build and install
+define $(PKG)_BUILD
     $(SED) -i 's,cc,$(TARGET)-gcc,'        $(1)/Makefile.in
     $(SED) -i 's,ar ,$(TARGET)-ar ,'       $(1)/Makefile.in
     $(SED) -i 's,ranlib,$(TARGET)-ranlib,' $(1)/Makefile.in
--- a/src/suitesparse.mk	Tue Nov 16 19:13:33 2010 +0100
+++ b/src/suitesparse.mk	Tue Nov 16 19:53:44 2010 +0100
@@ -20,17 +20,9 @@
 
 define $(PKG)_BUILD
     
-    # If not building metis in it's makefile, then
-    # build it here since the config seems to expect it
-    cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,metis)
-    $(SED) -i 's,cc,$(TARGET)-gcc,'        $(1)/$(metis_SUBDIR)/Makefile.in
-    $(SED) -i 's,ar ,$(TARGET)-ar ,'       $(1)/$(metis_SUBDIR)/Makefile.in
-    $(SED) -i 's,ranlib,$(TARGET)-ranlib,' $(1)/$(metis_SUBDIR)/Makefile.in
-    $(MAKE) -C '$(1)/$(metis_SUBDIR)/Lib' -j '$(JOBS)'
-
-    # Otherwise hack the config so it can find metis
-    #$(SED) -i 's,\(METIS_PATH = \)\(.    $(INSTALL) -m664 '$(1)/.    $(INSTALL) -m664 '$(1)/metis-4.0\),\1'$(PREFIX)/$(TARGET)/include/metis',' $(1)/UFconfig/UFconfig.mk
-    #$(SED) -i 's,\(METIS = \)\(.    $(INSTALL) -m664 '$(1)/.    $(INSTALL) -m664 '$(1)/metis-4.0/libmetis.a\),\1'$(PREFIX)/$(TARGET)/lib/libmetis.a',' $(1)/UFconfig/UFconfig.mk
+    # change the config to find metis
+    $(SED) -i 's,\(METIS_PATH = \)\(.    $(INSTALL) -m664 '$(1)/.    $(INSTALL) -m664 '$(1)/metis-4.0\),\1'$(PREFIX)/$(TARGET)/include/metis',' $(1)/UFconfig/UFconfig.mk
+    $(SED) -i 's,\(METIS = \)\(.    $(INSTALL) -m664 '$(1)/.    $(INSTALL) -m664 '$(1)/metis-4.0/libmetis.a\),\1'$(PREFIX)/$(TARGET)/lib/libmetis.a',' $(1)/UFconfig/UFconfig.mk
     
     # use cross tools
     $(SED) -i 's,cc,$(TARGET)-gcc,'        $(1)/UFconfig/UFconfig.mk