summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThorsten Glaser <tg@mirbsd.org>2014-05-03 13:23:35 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2014-05-03 13:25:11 (GMT)
commit5f2187e92c8d151b840454282fe390ebad030e35 (patch)
tree05d6bae9af2967e5b4968bb72c5a53b1b264788a
parente8b64ae830c3b612899c496317329f09ab31e703 (diff)
more flexible list of files to ignore when doing update-patches
e.g. for use with autoconf, but also for build-time generated files that are part of the distfile Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
-rw-r--r--mk/buildhlp.mk1
-rw-r--r--mk/pkg-bottom.mk5
-rw-r--r--package/xbmc/Makefile3
-rw-r--r--scripts/update-patches16
4 files changed, 12 insertions, 13 deletions
diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk
index bf3418b..4a3baea 100644
--- a/mk/buildhlp.mk
+++ b/mk/buildhlp.mk
@@ -111,6 +111,7 @@ endif
@WRKDIST=$(call shellescape,${WRKDIST}) \
WRKDIR1=$(call shellescape,${WRKDIR}) \
PATH=$(call shellescape,${HOST_PATH}) \
+ $(call shellexport,DIFF_IGNOREFILES) \
mksh ${TOPDIR}/scripts/update-patches2
.PHONY: update-patches host-update-patches
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk
index 2ccc6ff..bdc7104 100644
--- a/mk/pkg-bottom.mk
+++ b/mk/pkg-bottom.mk
@@ -267,3 +267,8 @@ ifeq (,$(filter noremove,${PKG_OPTS}))
fi
endif
@rm -f '${STAGING_PKG_DIR}/${PKG_NAME}'
+
+ifneq (,$(filter autoreconf,${AUTOTOOL_STYLE}))
+DIFF_IGNOREFILES?= configure missing depcomp install-sh INSTALL \
+ aclocal.m4 config.h.in Makefile.in */Makefile.in
+endif
diff --git a/package/xbmc/Makefile b/package/xbmc/Makefile
index e8fc5cc..138c17e 100644
--- a/package/xbmc/Makefile
+++ b/package/xbmc/Makefile
@@ -37,6 +37,9 @@ PKG_LIBC_DEPENDS:= glibc
WRKDIST= $(WRKDIR)/$(PKG_NAME)-$(PKG_VERSION)-Frodo
+DIFF_IGNOREFILES:= configure missing depcomp install-sh INSTALL \
+ aclocal.m4 config.h.in */Makefile.in
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,XBMC,xbmc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/scripts/update-patches b/scripts/update-patches
index 3d5424f..bf0f134 100644
--- a/scripts/update-patches
+++ b/scripts/update-patches
@@ -82,9 +82,6 @@ fi
if [[ -e $WRKDIST/../.autoreconf_done ]]; then
touch "$ORGDIST/.autoreconf_done"
- ignore_autoconf=1
-else
- ignore_autoconf=0
fi
DIFF_FLAGS="-adu -I \"^--- $(print -r -- "$D_SUBP.orig/" | $TRANSFORM)@@ .*\""
@@ -95,16 +92,9 @@ while IFS= read -p -d '' -r file; do
file=${file#./}
#print -r -- "DEBUG: <$file>" >>/tmp/debug
[[ ! -e $ORGDIST/$file && $patch_newfiles = 0 ]] && continue
- if (( ignore_autoconf )); then
- [[ $file = configure ]] && continue
- [[ $file = missing ]] && continue
- [[ $file = depcomp ]] && continue
- [[ $file = install-sh ]] && continue
- [[ $file = aclocal.m4 ]] && continue
- [[ $file = INSTALL ]] && continue
- [[ $file = config.h.in ]] && continue
- [[ ${file##*/} = Makefile.in ]] && continue
- fi
+ for i in $DIFF_IGNOREFILES; do
+ [[ $file = $i ]] && continue
+ done
cmp -s "$ORGDIST/$file" "$WRKDIST/$file" && continue
print -ru2 -- "Processing ${file}..."
# look in patchdir for an existing patchfile matching this