From 26cdd6f6c0e8c3b8efb4d01faacff8a979f40c47 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Tue, 25 Sep 2007 12:34:09 +0000 Subject: [PATCH] - make sure that configure doesn't see a wrong cache --- package/alsa-utils/alsa-utils.mk | 2 +- package/dialog/dialog.mk | 2 +- package/directfb/directfb.mk | 2 +- package/fbv/fbv.mk | 2 +- package/freetype/freetype.mk | 2 +- package/imagemagick/imagemagick.mk | 2 +- package/less/less.mk | 2 +- package/libcgi/libcgi.mk | 32 +++++++++---------- package/libcgicc/libcgicc.mk | 2 +- package/libgpg-error/libgpg-error.mk | 2 +- package/libsndfile/libsndfile.mk | 2 +- package/matchbox/matchbox.mk | 18 +++++------ .../module-init-tools/module-init-tools.mk | 2 +- package/modutils/modutils.mk | 2 +- package/ncftp/ncftp.mk | 2 +- package/netkitbase/netkitbase.mk | 5 +-- package/netkittelnet/netkittelnet.mk | 5 +-- package/netsnmp/netsnmp.mk | 3 +- package/openntpd/openntpd.mk | 2 +- package/qte/qte.mk | 8 ++--- package/tcl/tcl.mk | 2 +- package/tcpdump/dhcpdump.mk | 3 +- package/tcpdump/tcpdump.mk | 3 +- 23 files changed, 54 insertions(+), 53 deletions(-) diff --git a/package/alsa-utils/alsa-utils.mk b/package/alsa-utils/alsa-utils.mk index d692a8872b..ece864e064 100644 --- a/package/alsa-utils/alsa-utils.mk +++ b/package/alsa-utils/alsa-utils.mk @@ -21,7 +21,7 @@ $(ALSA_UTILS_DIR)/.unpacked: $(DL_DIR)/$(ALSA_UTILS_SOURCE) touch $@ $(ALSA_UTILS_DIR)/.configured: $(ALSA_UTILS_DIR)/.unpacked - (cd $(ALSA_UTILS_DIR); \ + (cd $(ALSA_UTILS_DIR); rm -f config.cache; \ $(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_ARGS) \ CFLAGS="$(TARGET_CFLAGS)" \ diff --git a/package/dialog/dialog.mk b/package/dialog/dialog.mk index 731f4faa7a..660881c013 100644 --- a/package/dialog/dialog.mk +++ b/package/dialog/dialog.mk @@ -18,7 +18,7 @@ $(DIALOG_DIR)/.source: $(DL_DIR)/$(DIALOG_SOURCE) touch $@ $(DIALOG_DIR)/.configured: $(DIALOG_DIR)/.source - (cd $(DIALOG_DIR); \ + (cd $(DIALOG_DIR); rm -f config.cache; \ $(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_ARGS) \ ./configure \ diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk index 08a2973df3..d103e8b37b 100644 --- a/package/directfb/directfb.mk +++ b/package/directfb/directfb.mk @@ -35,7 +35,7 @@ $(DIRECTFB_DIR)/.unpacked: $(DL_DIR)/$(DIRECTFB_SOURCE) touch $@ $(DIRECTFB_DIR)/.configured: $(DIRECTFB_DIR)/.unpacked - (cd $(DIRECTFB_DIR); \ + (cd $(DIRECTFB_DIR); rm -f config.cache; \ $(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_ARGS) \ ac_cv_header_linux_wm97xx_h=no \ diff --git a/package/fbv/fbv.mk b/package/fbv/fbv.mk index 528bb6f8c1..4e12a7a8f0 100644 --- a/package/fbv/fbv.mk +++ b/package/fbv/fbv.mk @@ -22,7 +22,7 @@ $(FBV_DIR)/.unpacked: $(DL_DIR)/$(FBV_SOURCE) touch $@ $(FBV_DIR)/.configured: $(FBV_DIR)/.unpacked - (cd $(FBV_DIR); \ + (cd $(FBV_DIR); rm -f config.cache; \ $(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_ARGS) \ ./configure \ diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk index f9fcce7b67..b26e5abc48 100644 --- a/package/freetype/freetype.mk +++ b/package/freetype/freetype.mk @@ -21,7 +21,7 @@ $(FREETYPE_DIR)/.unpacked: $(DL_DIR)/$(FREETYPE_SOURCE) # freetype for the target $(FREETYPE_DIR)/.configured: $(FREETYPE_DIR)/.unpacked - (cd $(FREETYPE_DIR); \ + (cd $(FREETYPE_DIR); rm -f config.cache; \ $(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_ARGS) \ ./configure \ diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index 24b303a84b..34a5bff1ac 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -33,7 +33,7 @@ $(IMAGEMAGICK_DIR)/.unpacked: $(DL_DIR)/$(IMAGEMAGICK_SOURCE) touch $@ $(IMAGEMAGICK_DIR)/.configured: $(IMAGEMAGICK_DIR)/.unpacked - (cd $(IMAGEMAGICK_DIR); \ + (cd $(IMAGEMAGICK_DIR); rm -f config.cache; \ $(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_ARGS) \ ./configure \ diff --git a/package/less/less.mk b/package/less/less.mk index 5957cb520e..4e373dfdc6 100644 --- a/package/less/less.mk +++ b/package/less/less.mk @@ -18,7 +18,7 @@ $(LESS_DIR)/.source: $(DL_DIR)/$(LESS_SOURCE) touch $@ $(LESS_DIR)/.configured: $(LESS_DIR)/.source - (cd $(LESS_DIR); \ + (cd $(LESS_DIR); rm -f config.cache; \ $(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_ARGS) \ ./configure \ diff --git a/package/libcgi/libcgi.mk b/package/libcgi/libcgi.mk index 101871d65c..c3d309c381 100644 --- a/package/libcgi/libcgi.mk +++ b/package/libcgi/libcgi.mk @@ -20,25 +20,25 @@ $(LIBCGI_DIR)/.source: $(DL_DIR)/$(LIBCGI_SOURCE) touch $(LIBCGI_DIR)/.source $(LIBCGI_DIR)/.configured: $(LIBCGI_DIR)/.source - (cd $(LIBCGI_DIR); \ + (cd $(LIBCGI_DIR); rm -f config.cache; \ $(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_ARGS) \ ./configure \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --prefix=/usr \ - --exec-prefix=/usr \ - --bindir=/usr/bin \ - --sbindir=/usr/sbin \ - --libdir=/lib \ - --libexecdir=/$(LIBCGI_DESTDIR) \ - --sysconfdir=/etc \ - --datadir=/usr/share \ - --localstatedir=/var \ - --includedir=/include \ - --mandir=/usr/man \ - --infodir=/usr/info \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + --prefix=/usr \ + --exec-prefix=/usr \ + --bindir=/usr/bin \ + --sbindir=/usr/sbin \ + --libdir=/lib \ + --libexecdir=/$(LIBCGI_DESTDIR) \ + --sysconfdir=/etc \ + --datadir=/usr/share \ + --localstatedir=/var \ + --includedir=/include \ + --mandir=/usr/man \ + --infodir=/usr/info \ ) touch $(LIBCGI_DIR)/.configured diff --git a/package/libcgicc/libcgicc.mk b/package/libcgicc/libcgicc.mk index 97cc5e1825..ef6ff68b29 100644 --- a/package/libcgicc/libcgicc.mk +++ b/package/libcgicc/libcgicc.mk @@ -20,7 +20,7 @@ $(LIBCGICC_DIR)/.unpacked: $(DL_DIR)/$(LIBCGICC_SOURCE) touch $(LIBCGICC_DIR)/.unpacked $(LIBCGICC_DIR)/.configured: $(LIBCGICC_DIR)/.unpacked - (cd $(LIBCGICC_DIR); \ + (cd $(LIBCGICC_DIR); rm -f config.cache; \ $(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_ARGS) \ ./configure \ diff --git a/package/libgpg-error/libgpg-error.mk b/package/libgpg-error/libgpg-error.mk index 32f6c966f6..3cb8dd232b 100644 --- a/package/libgpg-error/libgpg-error.mk +++ b/package/libgpg-error/libgpg-error.mk @@ -21,7 +21,7 @@ $(LIBGPG_ERROR_DIR)/.source: $(DL_DIR)/$(LIBGPG_ERROR_SOURCE) touch $(LIBGPG_ERROR_DIR)/.source $(LIBGPG_ERROR_DIR)/.configured: $(LIBGPG_ERROR_DIR)/.source - (cd $(LIBGPG_ERROR_DIR); \ + (cd $(LIBGPG_ERROR_DIR); rm -f config.cache; \ $(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_ARGS) \ ./configure \ diff --git a/package/libsndfile/libsndfile.mk b/package/libsndfile/libsndfile.mk index c64f830668..5a5fcda7ca 100644 --- a/package/libsndfile/libsndfile.mk +++ b/package/libsndfile/libsndfile.mk @@ -20,7 +20,7 @@ $(LIBSNDFILE_DIR)/.unpacked: $(DL_DIR)/$(LIBSNDFILE_SOURCE) touch $@ $(LIBSNDFILE_DIR)/.configured: $(LIBSNDFILE_DIR)/.unpacked - (cd $(LIBSNDFILE_DIR); \ + (cd $(LIBSNDFILE_DIR); rm -f config.cache; \ $(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_ARGS) \ ./configure \ diff --git a/package/matchbox/matchbox.mk b/package/matchbox/matchbox.mk index 6446b452c8..99c1988eea 100644 --- a/package/matchbox/matchbox.mk +++ b/package/matchbox/matchbox.mk @@ -212,7 +212,7 @@ endif $(MATCHBOX_LIB_DIR)/.configured: $(MATCHBOX_LIB_DIR)/.unpacked - (cd $(MATCHBOX_LIB_DIR); \ + (cd $(MATCHBOX_LIB_DIR); rm -f config.cache; \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \ LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ @@ -239,7 +239,7 @@ $(MATCHBOX_LIB_DIR)/.configured: $(MATCHBOX_LIB_DIR)/.unpacked touch $(MATCHBOX_LIB_DIR)/.configured $(MATCHBOX_SNOTIFY_DIR)/.configured: $(MATCHBOX_SNOTIFY_DIR)/.unpacked - (cd $(MATCHBOX_SNOTIFY_DIR); \ + (cd $(MATCHBOX_SNOTIFY_DIR); rm -f config.cache; \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \ LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ @@ -262,7 +262,7 @@ $(MATCHBOX_SNOTIFY_DIR)/.configured: $(MATCHBOX_SNOTIFY_DIR)/.unpacked touch $(MATCHBOX_SNOTIFY_DIR)/.configured $(MATCHBOX_WM_DIR)/.configured: $(MATCHBOX_WM_DIR)/.unpacked - (cd $(MATCHBOX_WM_DIR); \ + (cd $(MATCHBOX_WM_DIR); rm -f config.cache; \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \ LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ @@ -289,7 +289,7 @@ $(MATCHBOX_WM_DIR)/.configured: $(MATCHBOX_WM_DIR)/.unpacked touch $(MATCHBOX_WM_DIR)/.configured $(MATCHBOX_SM_DIR)/.configured: $(MATCHBOX_SM_DIR)/.unpacked - (cd $(MATCHBOX_SM_DIR); \ + (cd $(MATCHBOX_SM_DIR); rm -f config.cache; \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \ LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ @@ -315,7 +315,7 @@ $(MATCHBOX_SM_DIR)/.configured: $(MATCHBOX_SM_DIR)/.unpacked touch $(MATCHBOX_SM_DIR)/.configured $(MATCHBOX_CN_DIR)/.configured: $(MATCHBOX_CN_DIR)/.unpacked - (cd $(MATCHBOX_CN_DIR); \ + (cd $(MATCHBOX_CN_DIR); rm -f config.cache; \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \ LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ @@ -340,7 +340,7 @@ $(MATCHBOX_CN_DIR)/.configured: $(MATCHBOX_CN_DIR)/.unpacked touch $(MATCHBOX_CN_DIR)/.configured $(MATCHBOX_PL_DIR)/.configured: $(MATCHBOX_PL_DIR)/.unpacked - (cd $(MATCHBOX_PL_DIR); \ + (cd $(MATCHBOX_PL_DIR); rm -f config.cache; \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \ LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ @@ -366,7 +366,7 @@ $(MATCHBOX_PL_DIR)/.configured: $(MATCHBOX_PL_DIR)/.unpacked touch $(MATCHBOX_PL_DIR)/.configured $(MATCHBOX_DP_DIR)/.configured: $(MATCHBOX_DP_DIR)/.unpacked - (cd $(MATCHBOX_DP_DIR); \ + (cd $(MATCHBOX_DP_DIR); rm -f config.cache; \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \ LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ @@ -392,7 +392,7 @@ $(MATCHBOX_DP_DIR)/.configured: $(MATCHBOX_DP_DIR)/.unpacked touch $(MATCHBOX_DP_DIR)/.configured $(MATCHBOX_FK_DIR)/.configured: $(MATCHBOX_FK_DIR)/.unpacked - (cd $(MATCHBOX_FK_DIR); \ + (cd $(MATCHBOX_FK_DIR); rm -f config.cache; \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \ LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ @@ -418,7 +418,7 @@ $(MATCHBOX_FK_DIR)/.configured: $(MATCHBOX_FK_DIR)/.unpacked touch $(MATCHBOX_FK_DIR)/.configured $(MATCHBOX_KB_DIR)/.configured: $(MATCHBOX_KB_DIR)/.unpacked - (cd $(MATCHBOX_KB_DIR); \ + (cd $(MATCHBOX_KB_DIR); rm -f config.cache; \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \ LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ diff --git a/package/module-init-tools/module-init-tools.mk b/package/module-init-tools/module-init-tools.mk index 3865de8ff2..501414a4cb 100644 --- a/package/module-init-tools/module-init-tools.mk +++ b/package/module-init-tools/module-init-tools.mk @@ -24,7 +24,7 @@ $(MODULE_INIT_TOOLS_DIR)/.unpacked: $(DL_DIR)/$(MODULE_INIT_TOOLS_SOURCE) touch $(MODULE_INIT_TOOLS_DIR)/.unpacked $(MODULE_INIT_TOOLS_DIR)/.configured: $(MODULE_INIT_TOOLS_DIR)/.unpacked - (cd $(MODULE_INIT_TOOLS_DIR); \ + (cd $(MODULE_INIT_TOOLS_DIR); rm -f config.cache; \ $(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_ARGS) \ INSTALL=$(MODULE_INIT_TOOLS_DIR)/install-sh \ diff --git a/package/modutils/modutils.mk b/package/modutils/modutils.mk index 8ad2103569..69af990a78 100644 --- a/package/modutils/modutils.mk +++ b/package/modutils/modutils.mk @@ -29,7 +29,7 @@ $(MODUTILS_DIR1)/.source: $(DL_DIR)/$(MODUTILS_SOURCE) touch $(MODUTILS_DIR1)/.source $(MODUTILS_DIR1)/.configured: $(MODUTILS_DIR1)/.source - (cd $(MODUTILS_DIR1); \ + (cd $(MODUTILS_DIR1); rm -f config.cache; \ $(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_ARGS) \ INSTALL=$(MODUTILS_DIR1)/install-sh \ diff --git a/package/ncftp/ncftp.mk b/package/ncftp/ncftp.mk index 4f3c80cbe4..4169f80a7a 100644 --- a/package/ncftp/ncftp.mk +++ b/package/ncftp/ncftp.mk @@ -24,7 +24,7 @@ $(NCFTP_DIR)/.source: $(DL_DIR)/$(NCFTP_SOURCE) touch $@ $(NCFTP_DIR)/.configured: $(NCFTP_DIR)/.source - (cd $(NCFTP_DIR); \ + (cd $(NCFTP_DIR); rm -f config.cache; \ $(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_ARGS) \ ./configure \ diff --git a/package/netkitbase/netkitbase.mk b/package/netkitbase/netkitbase.mk index 5636877cb8..3f781152ce 100644 --- a/package/netkitbase/netkitbase.mk +++ b/package/netkitbase/netkitbase.mk @@ -26,8 +26,9 @@ $(NETKITBASE_DIR)/.unpacked: $(DL_DIR)/$(NETKITBASE_SOURCE) touch $(NETKITBASE_DIR)/.unpacked $(NETKITBASE_DIR)/.configured: $(NETKITBASE_DIR)/.unpacked - (cd $(NETKITBASE_DIR); PATH=$(TARGET_PATH) CC=$(TARGET_CC) \ - ./configure --installroot=$(TARGET_DIR) --with-c-compiler=$(TARGET_CC) \ + (cd $(NETKITBASE_DIR); rm -f config.cache; \ + PATH=$(TARGET_PATH) CC=$(TARGET_CC) \ + ./configure --installroot=$(TARGET_DIR) --with-c-compiler=$(TARGET_CC) \ ) touch $(NETKITBASE_DIR)/.configured diff --git a/package/netkittelnet/netkittelnet.mk b/package/netkittelnet/netkittelnet.mk index 10fbdcbff8..58bdbac2ed 100644 --- a/package/netkittelnet/netkittelnet.mk +++ b/package/netkittelnet/netkittelnet.mk @@ -27,8 +27,9 @@ $(NETKITTELNET_DIR)/.unpacked: $(DL_DIR)/$(NETKITTELNET_SOURCE) touch $(NETKITTELNET_DIR)/.unpacked $(NETKITTELNET_DIR)/.configured: $(NETKITTELNET_DIR)/.unpacked - (cd $(NETKITTELNET_DIR); PATH=$(TARGET_PATH) CC=$(TARGET_CC) \ - ./configure --installroot=$(TARGET_DIR) --with-c-compiler=$(TARGET_CC) \ + (cd $(NETKITTELNET_DIR); rm -f config.cache; \ + PATH=$(TARGET_PATH) CC=$(TARGET_CC) \ + ./configure --installroot=$(TARGET_DIR) --with-c-compiler=$(TARGET_CC) \ ) touch $(NETKITTELNET_DIR)/.configured diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk index 449f722013..054a1cc955 100644 --- a/package/netsnmp/netsnmp.mk +++ b/package/netsnmp/netsnmp.mk @@ -33,7 +33,8 @@ endif # sysctl code in this thing is apparently intended for # freebsd or some such thing... $(NETSNMP_DIR)/.configured: $(NETSNMP_DIR)/.unpacked - (cd $(NETSNMP_DIR); autoconf; \ + (cd $(NETSNMP_DIR); rm -f config.cache; \ + autoconf && \ ac_cv_CAN_USE_SYSCTL=no \ $(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_ARGS) \ diff --git a/package/openntpd/openntpd.mk b/package/openntpd/openntpd.mk index 9f99c9b73c..e8e1231bce 100644 --- a/package/openntpd/openntpd.mk +++ b/package/openntpd/openntpd.mk @@ -20,7 +20,7 @@ $(OPENNTPD_DIR)/.source: $(DL_DIR)/$(OPENNTPD_SOURCE) touch $@ $(OPENNTPD_DIR)/.configured: $(OPENNTPD_DIR)/.source - (cd $(OPENNTPD_DIR); \ + (cd $(OPENNTPD_DIR); rm -f config.cache; \ $(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_ARGS) \ ./configure \ diff --git a/package/qte/qte.mk b/package/qte/qte.mk index 10a3757c43..dd573de2b9 100644 --- a/package/qte/qte.mk +++ b/package/qte/qte.mk @@ -135,7 +135,7 @@ $(QTE_QTOPIA_DIR)/.unpacked: $(DL_DIR)/$(QTE_QTOPIA_SOURCE) # I'll fix that later. $(QTE_QTE_DIR)/.configured: $(QTE_QTE_DIR)/.unpacked $(QTE_TMAKE_DIR)/.unpacked $(QTE_QTE_DIR)/$(QTE_UIC_BINARY) $(QTE_QTE_DIR)/$(QTE_QVFB_BINARY) $(QTE_QTOPIA_DIR)/.unpacked cp $(QTE_QTOPIA_DIR)/src/qt/qconfig-qpe.h $(QTE_QTE_DIR)/src/tools/ - (cd $(@D); export QTDIR=`pwd`; export TMAKEPATH=$(QTE_TMAKE_DIR)/lib/qws/linux-x86-g++; export PATH=$(STAGING_DIR)/bin:$$QTDIR/bin:$$PATH; export LD_LIBRARY_PATH=$$QTDIR/lib:$$LD_LIBRARY_PATH; echo 'yes' | \ + (cd $(@D); rm -f config.cache; export QTDIR=`pwd`; export TMAKEPATH=$(QTE_TMAKE_DIR)/lib/qws/linux-x86-g++; export PATH=$(STAGING_DIR)/bin:$$QTDIR/bin:$$PATH; export LD_LIBRARY_PATH=$$QTDIR/lib:$$LD_LIBRARY_PATH; echo 'yes' | \ $(TARGET_CONFIGURE_ARGS) \ $(TARGET_CONFIGURE_OPTS) \ ./configure \ @@ -146,7 +146,7 @@ $(QTE_QTE_DIR)/.configured: $(QTE_QTE_DIR)/.unpacked $(QTE_TMAKE_DIR)/.unpacked ifneq ($(BR2_QTE_C_QTE_VERSION),$(BR2_QTE_C_QT3_VERSION)) # this is a host-side build, so we don't use any staging dir stuff, nor any TARGET_CONFIGURE_OPTS $(QTE_QT3_DIR)/.configured: $(QTE_QT3_DIR)/.unpacked $(QTE_TMAKE_DIR)/.unpacked - (cd $(@D); export QTDIR=`pwd`; export TMAKEPATH=$(QTE_TMAKE_DIR)/lib/qws/linux-x86-g++; export PATH=$$QTDIR/bin:$$PATH; export LD_LIBRARY_PATH=$$QTDIR/lib:$$LD_LIBRARY_PATH; echo 'yes' | \ + (cd $(@D); rm -f config.cache; export QTDIR=`pwd`; export TMAKEPATH=$(QTE_TMAKE_DIR)/lib/qws/linux-x86-g++; export PATH=$$QTDIR/bin:$$PATH; export LD_LIBRARY_PATH=$$QTDIR/lib:$$LD_LIBRARY_PATH; echo 'yes' | \ CC_FOR_BUILD="$(HOSTCC)" \ ./configure \ -fast $(QTE_QT3_CONFIGURE) \ @@ -155,7 +155,7 @@ $(QTE_QT3_DIR)/.configured: $(QTE_QT3_DIR)/.unpacked $(QTE_TMAKE_DIR)/.unpacked endif $(QTE_QVFB_DIR)/.configured: $(QTE_QVFB_DIR)/.unpacked $(QTE_TMAKE_DIR)/.unpacked - (cd $(@D); export QTDIR=`pwd`; export TMAKEPATH=$(QTE_TMAKE_DIR)/lib/linux-g++; export $$QTDIR/bin:$$PATH; export LD_LIBRARY_PATH=$$QTDIR/lib:$$LD_LIBRARY_PATH; echo 'yes' | \ + (cd $(@D); rm -f config.cache; export QTDIR=`pwd`; export TMAKEPATH=$(QTE_TMAKE_DIR)/lib/linux-g++; export $$QTDIR/bin:$$PATH; export LD_LIBRARY_PATH=$$QTDIR/lib:$$LD_LIBRARY_PATH; echo 'yes' | \ $(TARGET_CONFIGURE_OPTS) \ ./configure \ $(QTE_QVFB_CONFIGURE) \ @@ -169,7 +169,7 @@ $(QTE_QVFB_DIR)/.configured: $(QTE_QVFB_DIR)/.unpacked $(QTE_TMAKE_DIR)/.unpacke # then BR2_QTE_C_QTE_VERSION != BR2_QTE_C_QT3_VERSION, then we need to unpack the other Qt/E, so this dependency is not redundant. $(QTE_QTOPIA_DIR)/.configured: $(QTE_QTOPIA_DIR)/.unpacked $(QTE_TMAKE_DIR)/.unpacked $(QTE_QTE_DIR)/$(QTE_UIC_BINARY) $(QTE_QTE_DIR)/$(QTE_QVFB_BINARY) $(QTE_QT3_DIR)/.configured - (cd $(@D); export QTDIR=$(QTE_QTE_DIR); export QPEDIR=$(QTE_QTOPIA_DIR); export PATH=$(STAGING_DIR)/bin:$$QTDIR/bin:$$PATH; QT3DIR=$(QTE_QTE_DIR); echo 'yes' | \ + (cd $(@D); rm -f config.cache; export QTDIR=$(QTE_QTE_DIR); export QPEDIR=$(QTE_QTOPIA_DIR); export PATH=$(STAGING_DIR)/bin:$$QTDIR/bin:$$PATH; QT3DIR=$(QTE_QTE_DIR); echo 'yes' | \ $(TARGET_CONFIGURE_OPTS) \ ./configure \ $(QTE_QTOPIA_CONFIGURE) --edition phone -no-qtopiadesktop -dqt $(QTE_QT3_DIR) -arch generic -displaysize 160-240 -languages en_US \ diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk index 16fcd41e11..f0adb9026b 100644 --- a/package/tcl/tcl.mk +++ b/package/tcl/tcl.mk @@ -17,7 +17,7 @@ $(TCL_DIR)/.source: $(DL_DIR)/$(TCL_SOURCE) touch $(TCL_DIR)/.source $(TCL_DIR)/.configured: $(TCL_DIR)/.source - (cd $(TCL_DIR)/unix; \ + (cd $(TCL_DIR)/unix; rm -f config.cache; \ $(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_ARGS) \ ./configure \ diff --git a/package/tcpdump/dhcpdump.mk b/package/tcpdump/dhcpdump.mk index 0869735323..b288940d24 100644 --- a/package/tcpdump/dhcpdump.mk +++ b/package/tcpdump/dhcpdump.mk @@ -22,8 +22,7 @@ $(DHCPDUMP_DIR)/.unpacked: $(DL_DIR)/$(DHCPDUMP_SOURCE) touch $@ $(DHCPDUMP_DIR)/.configured: $(DHCPDUMP_DIR)/.unpacked - ( \ - cd $(DHCPDUMP_DIR); \ + (cd $(DHCPDUMP_DIR); rm -f config.cache; \ BUILD_CC=$(TARGET_CC) HOSTCC="$(HOSTCC)" \ $(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_ARGS) \ diff --git a/package/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk index fcd478b610..fb0953c10b 100644 --- a/package/tcpdump/tcpdump.mk +++ b/package/tcpdump/tcpdump.mk @@ -29,8 +29,7 @@ $(TCPDUMP_DIR)/.unpacked: $(DL_DIR)/$(TCPDUMP_SOURCE) touch $@ $(TCPDUMP_DIR)/.configured: $(TCPDUMP_DIR)/.unpacked - ( \ - cd $(TCPDUMP_DIR); \ + (cd $(TCPDUMP_DIR); rm -f config.cache; \ ac_cv_linux_vers=$(BR2_DEFAULT_KERNEL_HEADERS) \ BUILD_CC=$(TARGET_CC) HOSTCC="$(HOSTCC)" \ $(TARGET_CONFIGURE_OPTS) \ -- 2.30.2