From 03d65319620f61c7757b2b051a3a9d21cba91aab Mon Sep 17 00:00:00 2001 From: Hamish Moffatt Date: Tue, 12 Feb 2008 00:35:03 +0000 Subject: [PATCH] Run $(CONFIG_UPDATE) after unpacking sources Patch from Dan Nicolaescu --- package/autoconf/autoconf.mk | 1 + package/coreutils/coreutils.mk | 1 + package/cvs/cvs.mk | 1 + package/dialog/dialog.mk | 1 + package/expat/expat.mk | 1 + package/freetype/freetype.mk | 1 + package/grep/grep.mk | 1 + package/libdrm/libdrm.mk | 1 + package/libtool/libtool.mk | 2 ++ package/mplayer/mplayer.mk | 1 + package/nano/nano.mk | 1 + package/netcat/netcat.mk | 1 + package/rsync/rsync.mk | 1 + package/rxvt/rxvt.mk | 1 + package/sed/sed.mk | 2 ++ package/sudo/sudo.mk | 1 + package/tar/tar.mk | 2 ++ package/wget/wget.mk | 1 + package/which/which.mk | 1 + 19 files changed, 22 insertions(+) diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk index 2157fbeb6c..221541a5db 100644 --- a/package/autoconf/autoconf.mk +++ b/package/autoconf/autoconf.mk @@ -24,6 +24,7 @@ autoconf-source: $(DL_DIR)/$(AUTOCONF_SOURCE) $(AUTOCONF_SRC_DIR)/.unpacked: $(DL_DIR)/$(AUTOCONF_SOURCE) $(AUTOCONF_CAT) $(DL_DIR)/$(AUTOCONF_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) - + $(CONFIG_UPDATE) $(AUTOCONF_SRC_DIR) touch $@ ############################################################# diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk index bec70a624a..a3bc311b9a 100644 --- a/package/coreutils/coreutils.mk +++ b/package/coreutils/coreutils.mk @@ -22,6 +22,7 @@ coreutils-source: $(DL_DIR)/$(COREUTILS_SOURCE) $(COREUTILS_DIR)/.unpacked: $(DL_DIR)/$(COREUTILS_SOURCE) $(COREUTILS_CAT) $(DL_DIR)/$(COREUTILS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - toolchain/patch-kernel.sh $(COREUTILS_DIR) package/coreutils/ coreutils\*.patch + $(CONFIG_UPDATE) $(COREUTILS_DIR)/build-aux touch $@ $(COREUTILS_DIR)/.configured: $(COREUTILS_DIR)/.unpacked diff --git a/package/cvs/cvs.mk b/package/cvs/cvs.mk index f64e09a385..05bb06a145 100644 --- a/package/cvs/cvs.mk +++ b/package/cvs/cvs.mk @@ -38,6 +38,7 @@ $(CVS_DIR)/.unpacked: $(DL_DIR)/$(CVS_SOURCE) $(CVS_PATCH_FILE) $(BZCAT) $(CVS_DIR)/cvs-$(CVS_VERSION)/cvs-$(CVS_VERSION).tar.bz2 | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - rm -rf $(CVS_DIR)/cvs-$(CVS_VERSION) $(CONFIG_UPDATE) $(CVS_DIR) + $(CONFIG_UPDATE) $(CVS_DIR)/build-aux toolchain/patch-kernel.sh $(CVS_DIR) package/cvs \*$(CVS_VERSION)\*.patch ifneq ($(CVS_PATCH),) toolchain/patch-kernel.sh $(CVS_DIR) $(DL_DIR) $(CVS_PATCH) diff --git a/package/dialog/dialog.mk b/package/dialog/dialog.mk index 660881c013..6e91d6f41e 100644 --- a/package/dialog/dialog.mk +++ b/package/dialog/dialog.mk @@ -15,6 +15,7 @@ $(DL_DIR)/$(DIALOG_SOURCE): $(DIALOG_DIR)/.source: $(DL_DIR)/$(DIALOG_SOURCE) $(ZCAT) $(DL_DIR)/$(DIALOG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + $(CONFIG_UPDATE) $(DIALOG_DIR) touch $@ $(DIALOG_DIR)/.configured: $(DIALOG_DIR)/.source diff --git a/package/expat/expat.mk b/package/expat/expat.mk index c8a70b455e..8b05d55c45 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -22,6 +22,7 @@ $(EXPAT_DIR)/.unpacked: $(DL_DIR)/$(EXPAT_SOURCE) $(EXPAT_CAT) $(DL_DIR)/$(EXPAT_SOURCE) | \ tar -C $(BUILD_DIR) $(TAR_OPTIONS) - $(CONFIG_UPDATE) $(EXPAT_DIR) + $(CONFIG_UPDATE) $(EXPAT_DIR)/conftools touch $@ $(EXPAT_DIR)/.configured: $(EXPAT_DIR)/.unpacked diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk index e7e8666bec..17edebdb84 100644 --- a/package/freetype/freetype.mk +++ b/package/freetype/freetype.mk @@ -17,6 +17,7 @@ $(DL_DIR)/$(FREETYPE_SOURCE): $(FREETYPE_DIR)/.unpacked: $(DL_DIR)/$(FREETYPE_SOURCE) $(FREETYPE_CAT) $(DL_DIR)/$(FREETYPE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - $(CONFIG_UPDATE) $(FREETYPE_DIR) + $(CONFIG_UPDATE) $(FREETYPE_DIR)/builds/unix touch $(FREETYPE_DIR)/.unpacked # freetype for the target diff --git a/package/grep/grep.mk b/package/grep/grep.mk index 1369715f07..ed019b211b 100644 --- a/package/grep/grep.mk +++ b/package/grep/grep.mk @@ -22,6 +22,7 @@ $(GNUGREP_DIR)/.unpacked: $(DL_DIR)/$(GNUGREP_SOURCE) mv $(GNUGREP_DIR) $(GNUGREP_DIR).xxx $(GNUGREP_CAT) $(GNUGREP_DIR).xxx/grep_$(GNUGREP_VERSION).tar.gz | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - rm -rf $(GNUGREP_DIR).xxx + $(CONFIG_UPDATE) $(GNUGREP_DIR) touch $(GNUGREP_DIR)/.unpacked $(GNUGREP_DIR)/.configured: $(GNUGREP_DIR)/.unpacked diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk index 9857f5b336..a1fce77761 100644 --- a/package/libdrm/libdrm.mk +++ b/package/libdrm/libdrm.mk @@ -16,6 +16,7 @@ libdrm-source: $(DL_DIR)/$(LIBDRM_SOURCE) $(LIBDRM_DIR)/.unpacked: $(DL_DIR)/$(LIBDRM_SOURCE) $(LIBDRM_CAT) $(DL_DIR)/$(LIBDRM_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + $(CONFIG_UPDATE) $(LIBDRM_DIR) touch $@ $(LIBDRM_DIR)/.configured: $(LIBDRM_DIR)/.unpacked diff --git a/package/libtool/libtool.mk b/package/libtool/libtool.mk index 67300aacf2..fee88520a9 100644 --- a/package/libtool/libtool.mk +++ b/package/libtool/libtool.mk @@ -20,6 +20,8 @@ libtool-source: $(DL_DIR)/$(LIBTOOL_SOURCE) $(LIBTOOL_SRC_DIR)/.unpacked: $(DL_DIR)/$(LIBTOOL_SOURCE) $(LIBTOOL_CAT) $(DL_DIR)/$(LIBTOOL_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) - + $(CONFIG_UPDATE) $(LIBTOOL_SRC_DIR) + $(CONFIG_UPDATE) $(LIBTOOL_SRC_DIR)/libltdl touch $@ ############################################################# diff --git a/package/mplayer/mplayer.mk b/package/mplayer/mplayer.mk index 8adb44051f..90217a2797 100644 --- a/package/mplayer/mplayer.mk +++ b/package/mplayer/mplayer.mk @@ -23,6 +23,7 @@ $(DL_DIR)/$(MPLAYER_SOURCE): $(MPLAYER_DIR)/.unpacked: $(DL_DIR)/$(MPLAYER_SOURCE) $(MPLAYER_CAT) $(DL_DIR)/$(MPLAYER_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - toolchain/patch-kernel.sh $(MPLAYER_DIR) package/mplayer/ mplayer-$(MPLAYER_VERSION)\*.patch\* + $(CONFIG_UPDATE) $(MPLAYER_DIR) touch $@ $(MPLAYER_DIR)/.configured: $(MPLAYER_DIR)/.unpacked diff --git a/package/nano/nano.mk b/package/nano/nano.mk index 00bd15d05b..deeed32cc0 100644 --- a/package/nano/nano.mk +++ b/package/nano/nano.mk @@ -18,6 +18,7 @@ nano-source: $(DL_DIR)/$(NANO_SOURCE) $(NANO_DIR)/.unpacked: $(DL_DIR)/$(NANO_SOURCE) $(NANO_CAT) $(DL_DIR)/$(NANO_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + $(CONFIG_UPDATE) $(NANO_DIR) touch $(NANO_DIR)/.unpacked $(NANO_DIR)/.configured: $(NANO_DIR)/.unpacked diff --git a/package/netcat/netcat.mk b/package/netcat/netcat.mk index 37e66ce645..b61b5cffd5 100644 --- a/package/netcat/netcat.mk +++ b/package/netcat/netcat.mk @@ -19,6 +19,7 @@ netcat-source: $(DL_DIR)/$(NETCAT_SOURCE) $(NETCAT_DIR)/.unpacked: $(DL_DIR)/$(NETCAT_SOURCE) $(NETCAT_CAT) $(DL_DIR)/$(NETCAT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + $(CONFIG_UPDATE) $(NETCAT_DIR) touch $@ $(NETCAT_DIR)/.configured: $(NETCAT_DIR)/.unpacked diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk index 454f30c4ba..bb0153c471 100644 --- a/package/rsync/rsync.mk +++ b/package/rsync/rsync.mk @@ -19,6 +19,7 @@ rsync-source: $(DL_DIR)/$(RSYNC_SOURCE) $(RSYNC_DIR)/.unpacked: $(DL_DIR)/$(RSYNC_SOURCE) $(RSYNC_CAT) $(DL_DIR)/$(RSYNC_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - toolchain/patch-kernel.sh $(RSYNC_DIR) package/rsync/ rsync\*.patch + $(CONFIG_UPDATE) $(RSYNC_DIR) touch $(RSYNC_DIR)/.unpacked $(RSYNC_DIR)/.configured: $(RSYNC_DIR)/.unpacked diff --git a/package/rxvt/rxvt.mk b/package/rxvt/rxvt.mk index af0793cf34..2b4f06fe89 100644 --- a/package/rxvt/rxvt.mk +++ b/package/rxvt/rxvt.mk @@ -35,6 +35,7 @@ rxvt-source: $(DL_DIR)/$(RXVT_SOURCE) $(RXVT_DIR)/.unpacked: $(DL_DIR)/$(RXVT_SOURCE) $(RXVT_CAT) $(DL_DIR)/$(RXVT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - toolchain/patch-kernel.sh $(RXVT_DIR) package/rxvt/ \*.patch + $(CONFIG_UPDATE) $(RXVT_DIR)/autoconf touch $(RXVT_DIR)/.unpacked $(RXVT_DIR)/.configured: $(RXVT_DIR)/.unpacked diff --git a/package/sed/sed.mk b/package/sed/sed.mk index 2d04c451ea..177aed0a22 100644 --- a/package/sed/sed.mk +++ b/package/sed/sed.mk @@ -37,6 +37,7 @@ $(SED_DIR1)/.unpacked: $(DL_DIR)/$(SED_SOURCE) mkdir -p $(HOST_SED_DIR)/bin $(SED_CAT) $(DL_DIR)/$(SED_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) - toolchain/patch-kernel.sh $(SED_DIR1) package/sed/ configure.patch + $(CONFIG_UPDATE) $(SED_DIR1)/config touch $@ $(SED_DIR1)/.configured: $(SED_DIR1)/.unpacked @@ -105,6 +106,7 @@ endif ############################################################# $(SED_DIR2)/.unpacked: $(DL_DIR)/$(SED_SOURCE) $(SED_CAT) $(DL_DIR)/$(SED_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + $(CONFIG_UPDATE) $(SED_DIR2)/config touch $(SED_DIR2)/.unpacked $(SED_DIR2)/.configured: $(SED_DIR2)/.unpacked diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index c684ea7fb6..b67c50dd0c 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -18,6 +18,7 @@ sudo-source: $(DL_DIR)/$(SUDO_SOURCE) $(SUDO_CONFIG_FILE) $(SUDO_DIR)/.unpacked: $(DL_DIR)/$(SUDO_SOURCE) $(SUDO_UNZIP) $(DL_DIR)/$(SUDO_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - toolchain/patch-kernel.sh $(SUDO_DIR) package/sudo sudo\*.patch + $(CONFIG_UPDATE) $(SUDO_DIR) touch $(SUDO_DIR)/.unpacked $(SUDO_DIR)/.configured: $(SUDO_DIR)/.unpacked $(SUDO_CONFIG_FILE) diff --git a/package/tar/tar.mk b/package/tar/tar.mk index 99b3042778..ff7ee3a224 100644 --- a/package/tar/tar.mk +++ b/package/tar/tar.mk @@ -19,6 +19,8 @@ tar-source: $(DL_DIR)/$(GNUTAR_SOURCE) $(GNUTAR_DIR)/.unpacked: $(DL_DIR)/$(GNUTAR_SOURCE) $(GNUTAR_CAT) $(DL_DIR)/$(GNUTAR_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - toolchain/patch-kernel.sh $(GNUTAR_DIR) package/tar/ tar\*.patch + $(CONFIG_UPDATE) $(GNUTAR_DIR) + $(CONFIG_UPDATE) $(GNUTAR_DIR)/build-aux touch $@ $(GNUTAR_DIR)/.configured: $(GNUTAR_DIR)/.unpacked diff --git a/package/wget/wget.mk b/package/wget/wget.mk index 76e1a1f31c..7616591088 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -18,6 +18,7 @@ wget-source: $(DL_DIR)/$(WGET_SOURCE) $(WGET_DIR)/.unpacked: $(DL_DIR)/$(WGET_SOURCE) $(WGET_CAT) $(DL_DIR)/$(WGET_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + $(CONFIG_UPDATE) $(WGET_DIR) touch $(WGET_DIR)/.unpacked $(WGET_DIR)/.configured: $(WGET_DIR)/.unpacked diff --git a/package/which/which.mk b/package/which/which.mk index 2bdb258dea..be2a4027a5 100644 --- a/package/which/which.mk +++ b/package/which/which.mk @@ -18,6 +18,7 @@ which-source: $(DL_DIR)/$(WHICH_SOURCE) $(WHICH_DIR)/.unpacked: $(DL_DIR)/$(WHICH_SOURCE) $(WHICH_CAT) $(DL_DIR)/$(WHICH_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + $(CONFIG_UPDATE) $(WHICH_DIR) touch $(WHICH_DIR)/.unpacked $(WHICH_DIR)/.configured: $(WHICH_DIR)/.unpacked -- 2.30.2