Mercurial > mxe-octave

changeset 3174:6e323510f5b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix calls to UNPACK_PKG_ARCHIVE in src/*.mk files.
author Michael Goffioul <michael.goffioul@gmail.com>
date Wed, 24 Jul 2013 21:19:58 -0400
parents 33ba1ba99057
children f283b410a60f
files src/glib.mk src/native-gcc.mk src/openexr.mk src/wxwidgets.mk
diffstat 4 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/glib.mk	Tue Jul 23 22:29:33 2013 -0400
+++ b/src/glib.mk	Wed Jul 24 21:19:58 2013 -0400
@@ -19,7 +19,7 @@
     cp -Rp '$(1)' '$(1).native'
 
     # native build of libiconv (used by glib-genmarshal)
-    cd '$(1).native' && $(call UNPACK_PKG_ARCHIVE,libiconv)
+    cd '$(1).native' && $(call UNPACK_PKG_ARCHIVE,libiconv,$(TAR))
     cd '$(1).native/$(libiconv_SUBDIR)' && ./configure \
         $(ENABLE_SHARED_OR_STATIC) \
         --disable-nls
--- a/src/native-gcc.mk	Tue Jul 23 22:29:33 2013 -0400
+++ b/src/native-gcc.mk	Wed Jul 24 21:19:58 2013 -0400
@@ -22,11 +22,11 @@
 
 define $(PKG)_BUILD
     # unpack support libraries
-    cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,gcc-gmp)
+    cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,gcc-gmp,$(TAR))
     mv '$(1)/$(gcc-gmp_SUBDIR)' '$(1)/gmp'
-    cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,gcc-mpc)
+    cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,gcc-mpc,$(TAR))
     mv '$(1)/$(gcc-mpc_SUBDIR)' '$(1)/mpc'
-    cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,gcc-mpfr)
+    cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,gcc-mpfr,$(TAR))
     mv '$(1)/$(gcc-mpfr_SUBDIR)' '$(1)/mpfr'
 
     # build GCC and support libraries
--- a/src/openexr.mk	Tue Jul 23 22:29:33 2013 -0400
+++ b/src/openexr.mk	Wed Jul 24 21:19:58 2013 -0400
@@ -18,7 +18,7 @@
 
 define $(PKG)_BUILD
     # unpack and build a native version of ilmbase
-    cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,ilmbase)
+    cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,ilmbase,$(TAR))
     $(foreach PKG_PATCH,$(sort $(wildcard $(TOP_DIR)/src/ilmbase-*.patch)),
         (cd '$(1)/$(ilmbase_SUBDIR)' && $(PATCH) -p1 -u) < $(PKG_PATCH))
     echo 'echo $1' > '$(1)/$(ilmbase_SUBDIR)/config.sub'
--- a/src/wxwidgets.mk	Tue Jul 23 22:29:33 2013 -0400
+++ b/src/wxwidgets.mk	Wed Jul 24 21:19:58 2013 -0400
@@ -61,7 +61,7 @@
     $(INSTALL) -m755 '$(HOST_BINDIR)/wx-config' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)wx-config'
 
     # build the wxWidgets variant without unicode support
-    cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,wxwidgets)
+    cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,wxwidgets,$(TAR))
     $(foreach PKG_PATCH,$(sort $(wildcard $(TOP_DIR)/src/wxwidgets-*.patch)),
     (cd '$(1)/$(wxwidgets_SUBDIR)' && $(PATCH) -p1 -u) < $(PKG_PATCH))
     $(SED) -i 's,png_check_sig,png_sig_cmp,g'                       '$(1)/$(wxwidgets_SUBDIR)/configure'