diff options
| -rw-r--r-- | src/gcc.mk | 8 | ||||
| -rw-r--r-- | src/gmp.mk | 6 | ||||
| -rw-r--r-- | src/isl.mk | 8 | ||||
| -rw-r--r-- | src/mpc.mk | 8 | ||||
| -rw-r--r-- | src/mpfr.mk | 12 |
5 files changed, 31 insertions, 11 deletions
@@ -40,10 +40,10 @@ define $(PKG)_CONFIGURE --disable-win32-registry \ --enable-threads=win32 \ --disable-libgomp \ - --with-gmp='$(PREFIX)' \ - --with-isl='$(PREFIX)' \ - --with-mpc='$(PREFIX)' \ - --with-mpfr='$(PREFIX)' \ + --with-gmp='$(PREFIX)/$(BUILD)' \ + --with-isl='$(PREFIX)/$(BUILD)' \ + --with-mpc='$(PREFIX)/$(BUILD)' \ + --with-mpfr='$(PREFIX)/$(BUILD)' \ --with-as='$(PREFIX)/bin/$(TARGET)-as' \ --with-ld='$(PREFIX)/bin/$(TARGET)-ld' \ --with-nm='$(PREFIX)/bin/$(TARGET)-nm' \ @@ -9,8 +9,11 @@ $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION)a.tar.bz2 $(PKG)_URL := http://ftp.gnu.org/gnu/$(PKG)/$($(PKG)_FILE) $(PKG)_URL_2 := ftp://ftp.cs.tu-berlin.de/pub/gnu/$(PKG)/$($(PKG)_FILE) +$(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS) $(PKG)_DEPS := gcc +$(PKG)_DEPS_$(BUILD) := + define $(PKG)_UPDATE $(WGET) -q -O- 'http://www.gmplib.org/' | \ grep '<a href="' | \ @@ -41,8 +44,7 @@ endef define $(PKG)_BUILD_$(BUILD) mkdir '$(1).build' cd '$(1).build' && '$(1)/configure' \ - --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared + $(MXE_CONFIGURE_OPTS) $(MAKE) -C '$(1).build' -j '$(JOBS)' man1_MANS= $(MAKE) -C '$(1).build' -j 1 install man1_MANS= endef @@ -9,8 +9,11 @@ $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://isl.gforge.inria.fr/$($(PKG)_FILE) $(PKG)_URL_2 := ftp://gcc.gnu.org/pub/gcc/infrastructure/$($(PKG)_FILE) +$(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS) $(PKG)_DEPS := gcc gmp +$(PKG)_DEPS_$(BUILD) := gmp + # stick to tested versions from gcc define $(PKG)_UPDATE $(WGET) -q -O- 'ftp://gcc.gnu.org/pub/gcc/infrastructure/' | \ @@ -21,10 +24,7 @@ endef define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --enable-static \ - --disable-shared \ - --prefix='$(PREFIX)/$(TARGET)' \ + $(MXE_CONFIGURE_OPTS) \ --with-gmp-prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j '$(JOBS)' install @@ -9,22 +9,28 @@ $(PKG)_SUBDIR := mpc-$($(PKG)_VERSION) $(PKG)_FILE := mpc-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.multiprecision.org/mpc/download/$($(PKG)_FILE) $(PKG)_URL_2 := http://ftp.debian.org/debian/pool/main/m/mpclib/mpclib_$($(PKG)_VERSION).orig.tar.gz +$(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS) $(PKG)_DEPS := gcc gmp mpfr +$(PKG)_DEPS_$(BUILD) := gmp mpfr + define $(PKG)_UPDATE $(WGET) -q -O- 'https://gforge.inria.fr/scm/viewvc.php/tags/?root=mpc&sortby=date' | \ $(SED) -n 's,.*<a name="\([0-9][^"]*\)".*,\1,p' | \ head -1 endef -define $(PKG)_BUILD +define $(PKG)_BUILD_$(BUILD) cd '$(1)' && ./configure \ $(MXE_CONFIGURE_OPTS) \ --with-gmp='$(PREFIX)/$(TARGET)/' \ --with-mpfr='$(PREFIX)/$(TARGET)/' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j '$(JOBS)' install +endef +define $(PKG)_BUILD + $($(PKG)_BUILD_$(BUILD)) # build runtime tests to verify toolchain components -$(MAKE) -C '$(1)' -j '$(JOBS)' check -k rm -rf '$(PREFIX)/$(TARGET)/bin/$(PKG)-tests' diff --git a/src/mpfr.mk b/src/mpfr.mk index 4a14146..43fe8c0 100644 --- a/src/mpfr.mk +++ b/src/mpfr.mk @@ -9,8 +9,11 @@ $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz $(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/$(PKG)/$($(PKG)_FILE) $(PKG)_URL_2 := http://www.mpfr.org/mpfr-$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS) $(PKG)_DEPS := gcc gmp +$(PKG)_DEPS_$(BUILD) := gmp + define $(PKG)_UPDATE $(WGET) -q -O- 'http://www.mpfr.org/mpfr-current/#download' | \ grep 'mpfr-' | \ @@ -37,3 +40,12 @@ define $(PKG)_BUILD printf 'for /R %%%%f in (*.exe) do %%%%f || echo %%%%f fail >> all-tests-$(PKG)-$($(PKG)_VERSION).txt\r\n';) \ > '$(PREFIX)/$(TARGET)/bin/$(PKG)-tests/all-tests-$(PKG)-$($(PKG)_VERSION).bat' endef + +define $(PKG)_BUILD_$(BUILD) + mkdir '$(1).build' + cd '$(1).build' && '$(1)/configure' \ + $(MXE_CONFIGURE_OPTS) \ + --with-gmp='$(PREFIX)/$(TARGET)' + $(MAKE) -C '$(1).build' -j '$(JOBS)' + $(MAKE) -C '$(1).build' -j 1 install +endef |