Mercurial > mxe-octave

changeset 4603:7d0053d163db

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
split archive unpacking and patching into separate macro * Makefile.in (PREPARE_PKG_SOURCE): New macro. (PKG_RULE): Use it.
author John W. Eaton <jwe@octave.org>
date Sat, 24 Feb 2018 10:24:58 -0500
parents a487b12dc08f
children db65981db893
files Makefile.in
diffstat 1 files changed, 15 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.in	Fri Feb 09 07:46:04 2018 -0500
+++ b/Makefile.in	Sat Feb 24 10:24:58 2018 -0500
@@ -769,6 +769,20 @@
     head -1
 endef
 
+define PREPARE_PKG_SOURCE
+    ( cd '$(2)' && $(call UNPACK_PKG_ARCHIVE,$(1),$(TAR)) ) || \
+	    $(if $(TAR2), \
+		 ( rm -rf '$(2)'; mkdir -p '$(2)'; \
+		   cd '$(2)' && $(call UNPACK_PKG_ARCHIVE,$(1),$(TAR2)) ), \
+		 false )
+    test ! -d '$(TOP_DIR)/src/$(1)' || cp -a '$(TOP_DIR)/src/$(1)' '$(2)'
+    cd '$(2)/$($(1)_SUBDIR)'
+    $(foreach PKG_PATCH,$(sort $(wildcard $(TOP_DIR)/src/$(1)-*.patch)),
+	(cd '$(2)/$($(1)_SUBDIR)' && $(PATCH) -p1 -u) < $(PKG_PATCH))
+    $(foreach PKG_PATCH,$(sort $(wildcard $(TOP_DIR)/src/$(MXE_SYSTEM)-$(1)-*.patch)),
+	(cd '$(2)/$($(1)_SUBDIR)' && $(PATCH) -p1 -u) < $(PKG_PATCH))
+endef
+
 define PKG_RULE
 .PHONY: download-$(1)
 download-$(1): $(addprefix download-,$($(1)_DEPS))
@@ -826,17 +840,7 @@
 	$(if $(value $(1)_BUILD),
 	    rm -rf   '$(2)' '$(2)-install'
 	    mkdir -p '$(2)'
-	    ( cd '$(2)' && $(call UNPACK_PKG_ARCHIVE,$(1),$(TAR)) ) || \
-		    $(if $(TAR2), \
-		         ( rm -rf '$(2)'; mkdir -p '$(2)'; \
-		           cd '$(2)' && $(call UNPACK_PKG_ARCHIVE,$(1),$(TAR2)) ), \
-			 false )
-	    test ! -d '$(TOP_DIR)/src/$(1)' || cp -a '$(TOP_DIR)/src/$(1)' '$(2)'
-	    cd '$(2)/$($(1)_SUBDIR)'
-	    $(foreach PKG_PATCH,$(sort $(wildcard $(TOP_DIR)/src/$(1)-*.patch)),
-	        (cd '$(2)/$($(1)_SUBDIR)' && $(PATCH) -p1 -u) < $(PKG_PATCH))
-	    $(foreach PKG_PATCH,$(sort $(wildcard $(TOP_DIR)/src/$(MXE_SYSTEM)-$(1)-*.patch)),
-	        (cd '$(2)/$($(1)_SUBDIR)' && $(PATCH) -p1 -u) < $(PKG_PATCH))
+	    $$(call PREPARE_PKG_SOURCE,$(1),$(2))
 	    $$(call $(1)_BUILD,$(2)/$($(1)_SUBDIR),$(TOP_DIR)/src/$(1)-test,$(2)-install)
 	    if [ -d '$(2)-install' ]; then \
                 $(call GENERATE_FILE_LIST,$(1),$(2)-install); \