changeset 3046:f23cc822f52d

Makefile.in updates for native mingw qrupdate untar * Makefile.in: add bsdcpio as a requirement for native mingw and create a UNPACK_ARCHIVE filter rule for qrupdate.
author John Donoghue <john.donoghue@ieee.org>
date Thu, 13 Jun 2013 18:27:29 -0400
parents 4558fcd35fbb
children e7b7b0f663d3
files Makefile.in
diffstat 1 files changed, 16 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.in	Wed Jun 12 14:31:00 2013 -0400
+++ b/Makefile.in	Thu Jun 13 18:27:29 2013 -0400
@@ -98,6 +98,10 @@
 REQUIREMENTS := bash bzip2 gcc $(MAKE) openssl $(PATCH) $(PERL) \
                 $(SED) unzip wget xz
 
+ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
+  REQUIREMENTS += bsdcpio
+endif
+
 LIBTOOL     := libtool
 LIBTOOLIZE  := libtoolize
 BUILD_TOOLS := $(patsubst src/%.mk, %, $(wildcard src/build-*.mk))
@@ -212,6 +216,17 @@
 SHORT_PKG_VERSION = \
     $(word 1,$(subst ., ,$($(1)_VERSION))).$(word 2,$(subst ., ,$($(1)_VERSION)))
 
+ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
+UNPACK_ARCHIVE = \
+    $(if $(filter %rupdate-1.1.2.tar.gz,     $(1)),bsdcpio -id < '$(1)', \
+    $(if $(filter %.tgz,     $(1)),tar xzf '$(1)', \
+    $(if $(filter %.tar.gz,  $(1)),tar xzf '$(1)', \
+    $(if $(filter %.tar.bz2, $(1)),tar xjf '$(1)', \
+    $(if $(filter %.tar.lzma,$(1)),xz -dc -F lzma '$(1)' | tar xf -, \
+    $(if $(filter %.tar.xz,$(1)),xz -dc '$(1)' | tar xf -, \
+    $(if $(filter %.zip,     $(1)),unzip -q '$(1)', \
+    $(error Unknown archive format: $(1)))))))))
+else
 UNPACK_ARCHIVE = \
     $(if $(filter %.tgz,     $(1)),tar xzf '$(1)', \
     $(if $(filter %.tar.gz,  $(1)),tar xzf '$(1)', \
@@ -220,6 +235,7 @@
     $(if $(filter %.tar.xz,$(1)),xz -dc '$(1)' | tar xf -, \
     $(if $(filter %.zip,     $(1)),unzip -q '$(1)', \
     $(error Unknown archive format: $(1))))))))
+endif
 
 UNPACK_PKG_ARCHIVE = \
     $(call UNPACK_ARCHIVE,$(PKG_DIR)/$($(1)_FILE))