diff options
| author | Volker Grabsch <vog@notjusthosting.com> | 2010-11-16 18:53:44 (GMT) |
|---|---|---|
| committer | Volker Grabsch <vog@notjusthosting.com> | 2010-11-16 18:53:44 (GMT) |
| commit | 328b9d8a9d42d4de604cbe6c696d112abfda1430 (patch) | |
| tree | 0a11888e0cf5dbed9fd3a8a925d0c7d42144c7e3 | |
| parent | 66de4ee9ec029405130624dd903343e32f0f90b1 (diff) | |
| download | mxe-328b9d8a9d42d4de604cbe6c696d112abfda1430.zip mxe-328b9d8a9d42d4de604cbe6c696d112abfda1430.tar.gz mxe-328b9d8a9d42d4de604cbe6c696d112abfda1430.tar.bz2 | |
build package metis separately, don't build it inline with package suitesparse
| -rw-r--r-- | src/metis.mk | 5 | ||||
| -rw-r--r-- | src/suitesparse.mk | 14 |
2 files changed, 4 insertions, 15 deletions
diff --git a/src/metis.mk b/src/metis.mk index f6f821a..a337115 100644 --- a/src/metis.mk +++ b/src/metis.mk @@ -18,10 +18,7 @@ define $(PKG)_UPDATE 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 diff --git a/src/suitesparse.mk b/src/suitesparse.mk index 5244c7d..18064e0 100644 --- a/src/suitesparse.mk +++ b/src/suitesparse.mk @@ -20,17 +20,9 @@ endef 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 |