Mercurial > mxe-octave

changeset 3286:29e227f8bef6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't depend on build-m4/build-xz for MSVC and native-MinGW. * Makefile.in: Don't depend on build-m4 in native-MinGW. Don't depend on build-xz for MSVC, add xz to REQUIREMENTS. * src/build-autoconf.mk: Likewise. * src/build-m4.mk: Remove native-MinGW pass-through.
author Michael Goffioul <michael.goffioul@gmail.com>
date Tue, 05 Nov 2013 09:05:23 -0500
parents 67bcfe6539c7
children 5e2851e5d048
files Makefile.in src/build-autoconf.mk src/build-m4.mk
diffstat 3 files changed, 14 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.in	Tue Nov 05 09:05:23 2013 -0500
+++ b/Makefile.in	Tue Nov 05 09:05:23 2013 -0500
@@ -160,6 +160,12 @@
 # use the msys m4 in native mingw
 ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
   REQUIREMENTS += m4
+  BUILD_TOOLS := $(filter-out build-m4, $(BUILD_TOOLS))
+endif
+# Use msys xz under MSVC.
+ifeq ($(MXE_SYSTEM),msvc)
+  REQUIREMENTS += xz
+  BUILD_TOOLS := $(filter-out build-xz, $(BUILD_TOOLS))
 endif
 
 
--- a/src/build-autoconf.mk	Tue Nov 05 09:05:23 2013 -0500
+++ b/src/build-autoconf.mk	Tue Nov 05 09:05:23 2013 -0500
@@ -7,7 +7,14 @@
 $(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     := build-xz build-m4
+$(PKG)_DEPS     :=
+
+ifneq ($(MXE_SYSTEM),msvc)
+    ifneq ($(MXE_NATIVE_MINGW_BUILD),yes)
+        $(PKG)_DEPS += build-m4
+    endif
+    $(PKG)_DEPS += build-xz
+endif
 
 define $(PKG)_UPDATE
     echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
--- a/src/build-m4.mk	Tue Nov 05 09:05:23 2013 -0500
+++ b/src/build-m4.mk	Tue Nov 05 09:05:23 2013 -0500
@@ -14,11 +14,6 @@
     echo $($(PKG)_VERSION)
 endef
 
-ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
-define $(PKG)_BUILD
-    echo "Ignoring build-m4  for native mingw build"
-endef
-else
 define $(PKG)_BUILD
     mkdir '$(1).build'
     cd    '$(1).build' && '$(1)/configure' \
@@ -26,4 +21,3 @@
     $(MAKE) -C '$(1).build' -j '$(JOBS)'
     $(MAKE) -C '$(1).build' -j 1 install
 endef
-endif