Mercurial > mxe-octave
changeset 3198:ff92c0dc6aeb
handle build-PKG dependencies in src/build-PKG.mk files
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 05 Aug 2013 22:07:53 -0400 |
| parents | eea36aa5fc59 |
| children | 6c12182ab451 |
| files | Makefile.in src/build-autoconf.mk src/build-automake.mk src/build-binutils.mk src/build-bison.mk src/build-gcc.mk |
| diffstat | 6 files changed, 11 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.in Mon Aug 05 21:53:07 2013 -0400 +++ b/Makefile.in Mon Aug 05 22:07:53 2013 -0400 @@ -612,8 +612,3 @@ mkdir $(distdir) $(TAR) cf - $(DIST_FILES) | ( cd $(distdir) ; $(TAR) xpf - ) $(TAR) czf $(distdir).tar.gz $(distdir) - -build-autoconf build-bison: build-xz -build-automake: build-autoconf -build-binutils: build-gcc -build-gcc: build-cmake
--- a/src/build-autoconf.mk Mon Aug 05 21:53:07 2013 -0400 +++ b/src/build-autoconf.mk Mon Aug 05 22:07:53 2013 -0400 @@ -7,7 +7,7 @@ $(PKG)_SUBDIR := autoconf-$($(PKG)_VERSION) $(PKG)_FILE := autoconf-$($(PKG)_VERSION).tar.xz $(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/autoconf/$($(PKG)_FILE) -$(PKG)_DEPS := +$(PKG)_DEPS := build-xz define $(PKG)_UPDATE echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
--- a/src/build-automake.mk Mon Aug 05 21:53:07 2013 -0400 +++ b/src/build-automake.mk Mon Aug 05 22:07:53 2013 -0400 @@ -7,7 +7,7 @@ $(PKG)_SUBDIR := automake-$($(PKG)_VERSION) $(PKG)_FILE := automake-$($(PKG)_VERSION).tar.gz $(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/automake/$($(PKG)_FILE) -$(PKG)_DEPS := +$(PKG)_DEPS := build-autoconf define $(PKG)_UPDATE echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
--- a/src/build-binutils.mk Mon Aug 05 21:53:07 2013 -0400 +++ b/src/build-binutils.mk Mon Aug 05 22:07:53 2013 -0400 @@ -8,7 +8,11 @@ $(PKG)_FILE := binutils-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/binutils/$($(PKG)_FILE) $(PKG)_URL_2 := ftp://ftp.cs.tu-berlin.de/pub/gnu/binutils/$($(PKG)_FILE) -$(PKG)_DEPS := +ifeq ($(MXE_SYSTEM),mingw) + $(PKG)_DEPS := +else + $(PKG)_DEPS := build-gcc +endif define $(PKG)_UPDATE $(WGET) -q -O- 'http://ftp.gnu.org/gnu/binutils/?C=M;O=D' | \
--- a/src/build-bison.mk Mon Aug 05 21:53:07 2013 -0400 +++ b/src/build-bison.mk Mon Aug 05 22:07:53 2013 -0400 @@ -7,7 +7,7 @@ $(PKG)_SUBDIR := bison-$($(PKG)_VERSION) $(PKG)_FILE := bison-$($(PKG)_VERSION).tar.xz $(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/bison/$($(PKG)_FILE) -$(PKG)_DEPS := +$(PKG)_DEPS := build-xz define $(PKG)_UPDATE echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
--- a/src/build-gcc.mk Mon Aug 05 21:53:07 2013 -0400 +++ b/src/build-gcc.mk Mon Aug 05 22:07:53 2013 -0400 @@ -8,7 +8,9 @@ $(PKG)_FILE := gcc-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/gcc/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_URL_2 := ftp://ftp.mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE) -ifneq ($(MXE_NATIVE_BUILD),yes) +ifeq ($(MXE_NATIVE_BUILD),yes) + $(PKG)_DEPS := build-cmake +else ifeq ($(MXE_SYSTEM),mingw) $(PKG)_DEPS := mingwrt w32api build-binutils endif