diff options
| author | Tony Theodore <tonyt@logyst.com> | 2013-10-19 06:11:43 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2013-10-19 06:11:43 (GMT) |
| commit | 2b82342590795068e41ff72ebbe4d53889475e82 (patch) | |
| tree | a98819e9ca357d2057fecf0c1b2a3a18fc32ec99 | |
| parent | 2abbc856c59e32f6349afd54a389d03b2eaa6a0a (diff) | |
| download | mxe-2b82342590795068e41ff72ebbe4d53889475e82.zip mxe-2b82342590795068e41ff72ebbe4d53889475e82.tar.gz mxe-2b82342590795068e41ff72ebbe4d53889475e82.tar.bz2 | |
gcc support libraries: build separately in own package rules
| -rw-r--r-- | src/gcc-gmp.mk | 10 | ||||
| -rw-r--r-- | src/gcc-mpc.mk | 13 | ||||
| -rw-r--r-- | src/gcc-mpfr.mk | 13 | ||||
| -rw-r--r-- | src/gcc.mk | 19 |
4 files changed, 38 insertions, 17 deletions
diff --git a/src/gcc-gmp.mk b/src/gcc-gmp.mk index b7bfefe..c121310 100644 --- a/src/gcc-gmp.mk +++ b/src/gcc-gmp.mk @@ -14,3 +14,13 @@ $(PKG)_DEPS := define $(PKG)_UPDATE echo $(gmp_VERSION) endef + +define $(PKG)_BUILD + mkdir '$(1).build' + cd '$(1).build' && '$(1)/configure' \ + --prefix='$(PREFIX)' + $(MAKE) -C '$(1).build' -j '$(JOBS)' + $(MAKE) -C '$(1).build' -j 1 install +endef + +$(PKG)_BUILD_$(BUILD) = diff --git a/src/gcc-mpc.mk b/src/gcc-mpc.mk index 44bf20d..d150988 100644 --- a/src/gcc-mpc.mk +++ b/src/gcc-mpc.mk @@ -9,8 +9,19 @@ $(PKG)_SUBDIR = $(mpc_SUBDIR) $(PKG)_FILE = $(mpc_FILE) $(PKG)_URL = $(mpc_URL) $(PKG)_URL_2 = $(mpc_URL_2) -$(PKG)_DEPS := +$(PKG)_DEPS := gcc-gmp gcc-mpfr define $(PKG)_UPDATE echo $(mpc_VERSION) endef + +define $(PKG)_BUILD + mkdir '$(1).build' + cd '$(1).build' && '$(1)/configure' \ + --prefix='$(PREFIX)' \ + --with-gmp='$(PREFIX)' + $(MAKE) -C '$(1).build' -j '$(JOBS)' + $(MAKE) -C '$(1).build' -j 1 install +endef + +$(PKG)_BUILD_$(BUILD) = diff --git a/src/gcc-mpfr.mk b/src/gcc-mpfr.mk index 5e33038..1cf03b0 100644 --- a/src/gcc-mpfr.mk +++ b/src/gcc-mpfr.mk @@ -9,8 +9,19 @@ $(PKG)_SUBDIR = $(mpfr_SUBDIR) $(PKG)_FILE = $(mpfr_FILE) $(PKG)_URL = $(mpfr_URL) $(PKG)_URL_2 = $(mpfr_URL_2) -$(PKG)_DEPS := +$(PKG)_DEPS := gcc-gmp define $(PKG)_UPDATE echo $(mpfr_VERSION) endef + +define $(PKG)_BUILD + mkdir '$(1).build' + cd '$(1).build' && '$(1)/configure' \ + --prefix='$(PREFIX)' \ + --with-gmp='$(PREFIX)' + $(MAKE) -C '$(1).build' -j '$(JOBS)' + $(MAKE) -C '$(1).build' -j 1 install +endef + +$(PKG)_BUILD_$(BUILD) = @@ -22,18 +22,8 @@ define $(PKG)_UPDATE tail -1 endef -define $(PKG)_PRE_CONFIGURE - # unpack support libraries - cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,gcc-gmp) - mv '$(1)/$(gcc-gmp_SUBDIR)' '$(1)/gmp' - cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,gcc-mpc) - mv '$(1)/$(gcc-mpc_SUBDIR)' '$(1)/mpc' - cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,gcc-mpfr) - mv '$(1)/$(gcc-mpfr_SUBDIR)' '$(1)/mpfr' -endef - define $(PKG)_CONFIGURE - # configure gcc and support libraries + # configure gcc mkdir '$(1).build' cd '$(1).build' && '$(1)/configure' \ --target='$(TARGET)' \ @@ -53,8 +43,9 @@ define $(PKG)_CONFIGURE --enable-threads=win32 \ --disable-libgomp \ --disable-libmudflap \ - --with-mpfr-include='$(1)/mpfr/src' \ - --with-mpfr-lib='$(1).build/mpfr/src/.libs' \ + --with-gmp='$(PREFIX)' \ + --with-mpc='$(PREFIX)' \ + --with-mpfr='$(PREFIX)' \ $(shell [ `uname -s` == Darwin ] && echo "LDFLAGS='-Wl,-no_pie'") endef @@ -106,7 +97,6 @@ endef define $(PKG)_BUILD_i686-pc-mingw32 # build full cross gcc - $($(PKG)_PRE_CONFIGURE) \ $($(PKG)_CONFIGURE) \ --disable-sjlj-exceptions $(MAKE) -C '$(1).build' -j '$(JOBS)' @@ -117,7 +107,6 @@ endef define $(PKG)_BUILD_mingw-w64 # build standalone gcc - $($(PKG)_PRE_CONFIGURE) \ $($(PKG)_CONFIGURE) $(MAKE) -C '$(1).build' -j '$(JOBS)' all-gcc $(MAKE) -C '$(1).build' -j 1 install-gcc |