Skip to contentSkip to conversation

Pull request for branch remove-shared-config-cache

GIT PULL New Thomas Petazzoni 2 participants 3 messages Nov 4, 2010 – Nov 5, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

The following changes since commit df3e367c5b6253ebb1ca2de6b97b662793bdb5f3:
Peter Korsgaard (1):
CHANGES: update with modifications from gtk-bump branch

are available in the git repository at:

git://git.busybox.net/~tpetazzoni/git/buildroot remove-shared-config-cache

Thomas Petazzoni (1):
Remove support for shared configuration cache

 Config.in                                          |   14 --------------
 Makefile                                           |    9 ---------
 configs/arm_nptl_toolchain_defconfig               |    1 -
 configs/arm_toolchain_defconfig                    |    1 -
 configs/at91rm9200df_defconfig                     |    1 -
 configs/at91rm9200df_ext_bare_defconfig            |    1 -
 configs/at91rm9200df_ext_defconfig                 |    1 -
 configs/at91sam9260dfc_defconfig                   |    1 -
 configs/at91sam9260dfc_ext_bare_defconfig          |    1 -
 configs/at91sam9260dfc_ext_defconfig               |    1 -
 configs/at91sam9261ek_defconfig                    |    1 -
 configs/at91sam9261ek_ext_bare_defconfig           |    1 -
 configs/at91sam9261ek_ext_defconfig                |    1 -
 configs/at91sam9263ek_defconfig                    |    1 -
 configs/at91sam9263ek_ext_bare_defconfig           |    1 -
 configs/at91sam9263ek_ext_defconfig                |    1 -
 configs/at91sam9g20dfc_defconfig                   |    1 -
 configs/at91sam9g20dfc_ext_bare_defconfig          |    1 -
 configs/at91sam9g20dfc_ext_defconfig               |    1 -
 configs/atngw100-base_defconfig                    |    1 -
 configs/atngw100_defconfig                         |    1 -
 configs/atstk1005_defconfig                        |    1 -
 configs/atstk100x_defconfig                        |    1 -
 configs/i386_defconfig                             |    1 -
 configs/i686_defconfig                             |    1 -
 configs/integrator926_defconfig                    |    1 -
 configs/integrator926_huge_defconfig               |    1 -
 docs/buildroot.html                                |    7 -------
 package/Makefile.autotools.in                      |    3 ---
 package/fontconfig/fontconfig.mk                   |    1 -
 package/gamin/gamin.mk                             |    2 --
 package/haserl/haserl.mk                           |    2 --
 package/libxml2/libxml2.mk                         |    2 --
 package/multimedia/alsa-lib/alsa-lib.mk            |    2 --
 package/ng-spice-rework/ng-spice-rework.mk         |    2 --
 package/rpm/rpm.mk                                 |    2 --
 package/sqlite/sqlite.mk                           |    2 --
 .../xserver_xorg-server/xserver_xorg-server.mk     |    1 -
 38 files changed, 0 insertions(+), 74 deletions(-)

Thanks,

Signature · 1 line
Thomas Petazzoni
#1 lore raw

PATCH 1/1 Remove support for shared configuration cache

The configuration cache shared between packages, while being in principle a nice idea to speed-up the configuration of packages by avoiding repetitive identical checks, turned out to be unreliable due to the subtle differences between similar but not identical checks in different packages. After spending some time trying to fix those, we concluded that supporting the shared configuration cache is definitely too hard and too unreliable, and that we'd better get rid of it altogether.

This patch therefore removes the shared configuration cache infrastructure and usage.

---
 Config.in                                          |   14 --------------
 Makefile                                           |    9 ---------
 configs/arm_nptl_toolchain_defconfig               |    1 -
 configs/arm_toolchain_defconfig                    |    1 -
 configs/at91rm9200df_defconfig                     |    1 -
 configs/at91rm9200df_ext_bare_defconfig            |    1 -
 configs/at91rm9200df_ext_defconfig                 |    1 -
 configs/at91sam9260dfc_defconfig                   |    1 -
 configs/at91sam9260dfc_ext_bare_defconfig          |    1 -
 configs/at91sam9260dfc_ext_defconfig               |    1 -
 configs/at91sam9261ek_defconfig                    |    1 -
 configs/at91sam9261ek_ext_bare_defconfig           |    1 -
 configs/at91sam9261ek_ext_defconfig                |    1 -
 configs/at91sam9263ek_defconfig                    |    1 -
 configs/at91sam9263ek_ext_bare_defconfig           |    1 -
 configs/at91sam9263ek_ext_defconfig                |    1 -
 configs/at91sam9g20dfc_defconfig                   |    1 -
 configs/at91sam9g20dfc_ext_bare_defconfig          |    1 -
 configs/at91sam9g20dfc_ext_defconfig               |    1 -
 configs/atngw100-base_defconfig                    |    1 -
 configs/atngw100_defconfig                         |    1 -
 configs/atstk1005_defconfig                        |    1 -
 configs/atstk100x_defconfig                        |    1 -
 configs/i386_defconfig                             |    1 -
 configs/i686_defconfig                             |    1 -
 configs/integrator926_defconfig                    |    1 -
 configs/integrator926_huge_defconfig               |    1 -
 docs/buildroot.html                                |    7 -------
 package/Makefile.autotools.in                      |    3 ---
 package/fontconfig/fontconfig.mk                   |    1 -
 package/gamin/gamin.mk                             |    2 --
 package/haserl/haserl.mk                           |    2 --
 package/libxml2/libxml2.mk                         |    2 --
 package/multimedia/alsa-lib/alsa-lib.mk            |    2 --
 package/ng-spice-rework/ng-spice-rework.mk         |    2 --
 package/rpm/rpm.mk                                 |    2 --
 package/sqlite/sqlite.mk                           |    2 --
 .../xserver_xorg-server/xserver_xorg-server.mk     |    1 -
 38 files changed, 0 insertions(+), 74 deletions(-)
Config.in +0 -14
index 0f8ddf4..43baed1 100644
@@ -256,20 +256,6 @@ config BR2_HAVE_DEVFILES
 	  Install headers and static libraries in the
 	  target filesystem
 
-menu "Advanced"
-
-config BR2_CONFIG_CACHE
-	bool "Use a central configure cache file (EXPERIMENTAL)"
-	help
-	  Notice: This is experimental and known to break with certain
-	  package combinations.
-
-	  This determines if a central config cache is used by
-	  packages, reducing the configure time for packages as each
-	  one caches its findings.
-
-endmenu
-
 endmenu
 
 source "toolchain/Config.in"
Makefile +0 -9
index 22c3801..be28ace 100644
@@ -449,15 +449,6 @@ external-deps:
 show-targets:
 	@echo $(TARGETS)
 
-ifeq ($(BR2_CONFIG_CACHE),y)
-# drop configure caches if configuration is changed
-$(BUILD_DIR)/tgt-config.cache $(BUILD_DIR)/host-config.cache: $(CONFIG_DIR)/.config
-	rm -f $@
-	touch $@
-
-$(BASE_TARGETS): | $(BUILD_DIR)/tgt-config.cache $(BUILD_DIR)/host-config.cache
-endif
-
 else # ifeq ($(BR2_HAVE_DOT_CONFIG),y)
 
 all: menuconfig
configs/arm_nptl_toolchain_defconfig +0 -1
index d7b26a5..e167bc3 100644
@@ -155,7 +155,6 @@ BR2_OPTIMIZE_2=y
 #
 # Advanced
 #
-# BR2_CONFIG_CACHE is not set
 
 #
 # Toolchain
configs/arm_toolchain_defconfig +0 -1
index 37426ae..d4642d9 100644
@@ -160,7 +160,6 @@ BR2_TOPDIR_SUFFIX=""
 BR2_ROOTFS_PREFIX="rootfs"
 BR2_JLEVEL=2
 # BR2_DEPRECATED is not set
-# BR2_CONFIG_CACHE is not set
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
 # BR2_STRIP_sstrip is not set
configs/at91rm9200df_defconfig +0 -1
index ac5bfa3..de061ac 100644
@@ -165,7 +165,6 @@ BR2_TOPDIR_SUFFIX=""
 BR2_ROOTFS_PREFIX="at91sam9260dfc"
 BR2_JLEVEL=2
 # BR2_DEPRECATED is not set
-# BR2_CONFIG_CACHE is not set
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
 # BR2_STRIP_sstrip is not set
configs/at91rm9200df_ext_bare_defconfig +0 -1
index 608460d..522daff 100644
@@ -160,7 +160,6 @@ BR2_TOPDIR_SUFFIX=""
 BR2_ROOTFS_PREFIX="at91rm9200df-rootfs"
 BR2_JLEVEL=2
 # BR2_DEPRECATED is not set
-# BR2_CONFIG_CACHE is not set
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
 # BR2_STRIP_sstrip is not set
configs/at91rm9200df_ext_defconfig +0 -1
index 26ec527..d030b1e 100644
@@ -171,7 +171,6 @@ BR2_TOPDIR_SUFFIX=""
 BR2_ROOTFS_PREFIX="at91rm9200df-rootfs"
 BR2_JLEVEL=2
 # BR2_DEPRECATED is not set
-# BR2_CONFIG_CACHE is not set
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
 # BR2_STRIP_sstrip is not set
configs/at91sam9260dfc_defconfig +0 -1
index 50fa8ef..1740e13 100644
@@ -178,7 +178,6 @@ BR2_TOPDIR_SUFFIX=""
 BR2_ROOTFS_PREFIX="at91sam9260dfc-rootfs"
 BR2_JLEVEL=2
 # BR2_DEPRECATED is not set
-# BR2_CONFIG_CACHE is not set
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
 # BR2_STRIP_sstrip is not set
configs/at91sam9260dfc_ext_bare_defconfig +0 -1
index 9977e42..bbaadfb 100644
@@ -160,7 +160,6 @@ BR2_TOPDIR_SUFFIX=""
 BR2_ROOTFS_PREFIX="at91sam9260dfc-rootfs"
 BR2_JLEVEL=2
 # BR2_DEPRECATED is not set
-# BR2_CONFIG_CACHE is not set
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
 # BR2_STRIP_sstrip is not set
configs/at91sam9260dfc_ext_defconfig +0 -1
index b46b8b0..1df4926 100644
@@ -179,7 +179,6 @@ BR2_TOPDIR_SUFFIX=""
 BR2_ROOTFS_PREFIX="at91sam9260dfc-rootfs"
 BR2_JLEVEL=2
 # BR2_DEPRECATED is not set
-# BR2_CONFIG_CACHE is not set
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
 # BR2_STRIP_sstrip is not set
configs/at91sam9261ek_defconfig +0 -1
index 2ef1748..f4c0755 100644
@@ -181,7 +181,6 @@ BR2_TOPDIR_SUFFIX=""
 BR2_ROOTFS_PREFIX="at91sam9261ek-NAND"
 BR2_JLEVEL=2
 # BR2_DEPRECATED is not set
-# BR2_CONFIG_CACHE is not set
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
 # BR2_STRIP_sstrip is not set
configs/at91sam9261ek_ext_bare_defconfig +0 -1
index 6837f41..ec86bae 100644
@@ -163,7 +163,6 @@ BR2_TOPDIR_SUFFIX=""
 BR2_ROOTFS_PREFIX="at91sam9261ek-rootfs"
 BR2_JLEVEL=2
 # BR2_DEPRECATED is not set
-# BR2_CONFIG_CACHE is not set
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
 # BR2_STRIP_sstrip is not set
configs/at91sam9261ek_ext_defconfig +0 -1
index 1f64123..39b5019 100644
@@ -182,7 +182,6 @@ BR2_TOPDIR_SUFFIX=""
 BR2_ROOTFS_PREFIX="at91sam9261ek-NAND"
 BR2_JLEVEL=2
 # BR2_DEPRECATED is not set
-# BR2_CONFIG_CACHE is not set
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
 # BR2_STRIP_sstrip is not set
configs/at91sam9263ek_defconfig +0 -1
index df559da..cfa8742 100644
@@ -179,7 +179,6 @@ BR2_TOPDIR_SUFFIX=""
 BR2_ROOTFS_PREFIX="at91sam9263ek-NAND"
 BR2_JLEVEL=2
 # BR2_DEPRECATED is not set
-# BR2_CONFIG_CACHE is not set
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
 # BR2_STRIP_sstrip is not set
configs/at91sam9263ek_ext_bare_defconfig +0 -1
index 8143318..54755ce 100644
@@ -162,7 +162,6 @@ BR2_TOPDIR_SUFFIX=""
 BR2_ROOTFS_PREFIX="at91sam9263ek-rootfs"
 BR2_JLEVEL=2
 # BR2_DEPRECATED is not set
-# BR2_CONFIG_CACHE is not set
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
 # BR2_STRIP_sstrip is not set
configs/at91sam9263ek_ext_defconfig +0 -1
index d044d05..56605d9 100644
@@ -181,7 +181,6 @@ BR2_TOPDIR_SUFFIX=""
 BR2_ROOTFS_PREFIX="at91sam9263ek-NAND"
 BR2_JLEVEL=2
 # BR2_DEPRECATED is not set
-# BR2_CONFIG_CACHE is not set
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
 # BR2_STRIP_sstrip is not set
configs/at91sam9g20dfc_defconfig +0 -1
index 7239327..dc9b600 100644
@@ -179,7 +179,6 @@ BR2_TOPDIR_SUFFIX=""
 BR2_ROOTFS_PREFIX="at91sam92g20ek-rootfs"
 BR2_JLEVEL=2
 # BR2_DEPRECATED is not set
-# BR2_CONFIG_CACHE is not set
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
 # BR2_STRIP_sstrip is not set
configs/at91sam9g20dfc_ext_bare_defconfig +0 -1
index a63706e..c43c6f9 100644
@@ -160,7 +160,6 @@ BR2_TOPDIR_SUFFIX=""
 BR2_ROOTFS_PREFIX="at91sam9g20dfc-rootfs"
 BR2_JLEVEL=2
 # BR2_DEPRECATED is not set
-# BR2_CONFIG_CACHE is not set
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
 # BR2_STRIP_sstrip is not set
configs/at91sam9g20dfc_ext_defconfig +0 -1
index 02dd6b4..e61234b 100644
@@ -179,7 +179,6 @@ BR2_TOPDIR_SUFFIX=""
 BR2_ROOTFS_PREFIX="at91sam9g20dfc-rootfs"
 BR2_JLEVEL=2
 # BR2_DEPRECATED is not set
-# BR2_CONFIG_CACHE is not set
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
 # BR2_STRIP_sstrip is not set
configs/atngw100-base_defconfig +0 -1
index ec3d4a0..2b79015 100644
@@ -112,7 +112,6 @@ BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_JLEVEL=2
 # BR2_DEPRECATED is not set
-# BR2_CONFIG_CACHE is not set
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
 # BR2_STRIP_sstrip is not set
configs/atngw100_defconfig +0 -1
index 6d8293c..ec87a09 100644
@@ -108,7 +108,6 @@ BR2_OPTIMIZE_S=y
 #
 # Advanced
 #
-# BR2_CONFIG_CACHE is not set
 
 #
 # Toolchain
configs/atstk1005_defconfig +0 -1
index d0ec24d..6212e2b 100644
@@ -111,7 +111,6 @@ BR2_TOPDIR_SUFFIX=""
 BR2_ROOTFS_PREFIX="rootfs"
 BR2_JLEVEL=2
 # BR2_DEPRECATED is not set
-# BR2_CONFIG_CACHE is not set
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
 # BR2_STRIP_sstrip is not set
configs/atstk100x_defconfig +0 -1
index 6ee8f11..ce50944 100644
@@ -111,7 +111,6 @@ BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_JLEVEL=2
 # BR2_DEPRECATED is not set
-# BR2_CONFIG_CACHE is not set
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
 # BR2_STRIP_sstrip is not set
configs/i386_defconfig +0 -1
index 672b694..80100d6 100644
@@ -113,7 +113,6 @@ BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_JLEVEL=2
 # BR2_DEPRECATED is not set
-# BR2_CONFIG_CACHE is not set
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
 # BR2_STRIP_sstrip is not set
configs/i686_defconfig +0 -1
index 5b1b56f..4a128e8 100644
@@ -113,7 +113,6 @@ BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_JLEVEL=2
 # BR2_DEPRECATED is not set
-# BR2_CONFIG_CACHE is not set
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
 # BR2_STRIP_sstrip is not set
configs/integrator926_defconfig +0 -1
index d7ccc65..fc2dccf 100644
@@ -110,7 +110,6 @@ BR2_TOPDIR_SUFFIX=""
 BR2_ROOTFS_PREFIX="rootfs"
 BR2_JLEVEL=2
 # BR2_DEPRECATED is not set
-# BR2_CONFIG_CACHE is not set
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
 # BR2_STRIP_sstrip is not set
configs/integrator926_huge_defconfig +0 -1
index f88fcc7..c56b628 100644
@@ -110,7 +110,6 @@ BR2_TOPDIR_SUFFIX=""
 BR2_ROOTFS_PREFIX="$(BOARD_NAME)-rootfs"
 BR2_JLEVEL=2
 # BR2_DEPRECATED is not set
-# BR2_CONFIG_CACHE is not set
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
 # BR2_STRIP_sstrip is not set
docs/buildroot.html +0 -7
index 00808ff..94726c8 100644
@@ -1268,13 +1268,6 @@ LIBFOO_POST_PATCH_HOOKS += LIBFOO_POST_PATCH_FIXUP
       not. Valid values are <code>YES</code> and <code>NO</code>. By
       default, the value is <code>YES</code></li>
 
-      <li><code>LIBFOO_USE_CONFIG_CACHE</code> tells whether the configure
-      script should use the central configure cache, which caches test
-      results from previous configure scripts. Usually, this variable should
-      be left to its default value. Only packages having issues with the
-      configure cache, can set this variable to the <code>NO</code> value
-      (but this is more of a work-around than a fix)</li>
-
       <li><code>LIBFOO_INSTALL_STAGING_OPT</code> contains the make options
       used to install the package to the staging directory. By default, the
       value is <code>DESTDIR=$$(STAGING_DIR) install</code>, which is
package/Makefile.autotools.in +0 -3
index 87c3092..e1cf60a 100644
@@ -64,7 +64,6 @@ $(2)_MAKE_ENV			?=
 $(2)_MAKE_OPT			?=
 $(2)_AUTORECONF			?= NO
 $(2)_AUTORECONF_OPT		?=
-$(2)_USE_CONFIG_CACHE           ?= $(if $(BR2_CONFIG_CACHE),YES,NO)
 $(2)_INSTALL_STAGING_OPT	?= DESTDIR=$$(STAGING_DIR) install
 $(2)_INSTALL_TARGET_OPT		?= DESTDIR=$$(TARGET_DIR)  install
 $(2)_CLEAN_OPT			?= clean
@@ -88,7 +87,6 @@ define $(2)_CONFIGURE_CMDS
 	$$(TARGET_CONFIGURE_ARGS) \
 	$$($$(PKG)_CONF_ENV) \
 	./configure \
-		$$(if $$(filter YES,$$($$(PKG)_USE_CONFIG_CACHE)),--cache-file="$(BUILD_DIR)/tgt-config.cache",) \
 		--target=$$(GNU_TARGET_NAME) \
 		--host=$$(GNU_TARGET_NAME) \
 		--build=$$(GNU_HOST_NAME) \
@@ -112,7 +110,6 @@ define $(2)_CONFIGURE_CMDS
 		LDFLAGS="$$(HOST_LDFLAGS)" \
                 $$($$(PKG)_CONF_ENV) \
 		./configure \
-		$$(if $$(filter YES,$$($$(PKG)_USE_CONFIG_CACHE)),--cache-file="$(BUILD_DIR)/host-config.cache",) \
 		--prefix="$$(HOST_DIR)/usr" \
 		--sysconfdir="$$(HOST_DIR)/etc" \
 		$$($$(PKG)_CONF_OPT) \
package/fontconfig/fontconfig.mk +0 -1
index 6cbe2ea..a875e74 100644
@@ -7,7 +7,6 @@ FONTCONFIG_VERSION = 2.6.0
 FONTCONFIG_SOURCE = fontconfig-$(FONTCONFIG_VERSION).tar.gz
 FONTCONFIG_SITE = http://fontconfig.org/release
 FONTCONFIG_AUTORECONF = YES
-FONTCONFIG_USE_CONFIG_CACHE = NO
 FONTCONFIG_INSTALL_STAGING = YES
 FONTCONFIG_INSTALL_TARGET = YES
 # This package does not like using the target cflags for some reason.
package/gamin/gamin.mk +0 -2
index db27692..f0600b2 100644
@@ -19,8 +19,6 @@ GAMIN_CONF_ENV = have_abstract_sockets=no
 
 ifneq ($(BR2_LARGEFILE),y)
 GAMIN_CONF_ENV += CC="$(TARGET_CC) $(TARGET_CFLAGS) -DNO_LARGEFILE_SOURCE"
-# the above doesn't work with shared config.cache
-GAMIN_USE_CONFIG_CACHE = NO
 endif
 
 GAMIN_DEPENDENCIES = libglib2
package/haserl/haserl.mk +0 -2
index 79f0241..a8585e8 100644
@@ -11,8 +11,6 @@ HASERL_INSTALL_TARGET:=YES
 
 # force haserl 0.8.0 to use install-sh so stripping works
 HASERL_CONF_ENV = ac_cv_path_install=./install-sh
-# the above doesn't interact nicely with a shared cache, so disable for now
-HASERL_USE_CONFIG_CACHE = NO
 ifeq ($(BR2_PACKAGE_HASERL_WITH_LUA),y)
 	HASERL_CONF_OPT += --with-lua=$(STAGING_DIR) \
 		--with-lua-headers=$(STAGING_DIR)
package/libxml2/libxml2.mk +0 -2
index 820f465..387dce3 100644
@@ -13,8 +13,6 @@ LIBXML2_LIBTOOL_PATCH = NO
 
 ifneq ($(BR2_LARGEFILE),y)
 LIBXML2_CONF_ENV = CC="$(TARGET_CC) $(TARGET_CFLAGS) -DNO_LARGEFILE_SOURCE"
-# the above doesn't work with shared config.cache
-LIBXML2_USE_CONFIG_CACHE = NO
 endif
 
 LIBXML2_CONF_OPT = --with-gnu-ld --enable-shared \
package/multimedia/alsa-lib/alsa-lib.mk +0 -2
index ee9d9bc..a3d5fe4 100644
@@ -67,8 +67,6 @@ endif
 
 ALSA_LIB_CONF_ENV = CFLAGS="$(ALSA_LIB_CFLAGS)" \
 		    LDFLAGS="$(TARGET_LDFLAGS) -lm"
-# the above doesn't work with shared config.cache
-ALSA_LIB_USE_CONFIG_CACHE = NO
 
 define ALSA_LIB_UNINSTALL_TARGET_CMDS
 	-rm -f $(TARGET_DIR)/usr/lib/libasound.so*
package/ng-spice-rework/ng-spice-rework.mk +0 -2
index 7515d25..113b59d 100644
@@ -11,8 +11,6 @@ NG_SPICE_REWORK_INSTALL_STAGING = NO
 NG_SPICE_REWORK_INSTALL_TARGET = YES
 
 NG_SPICE_REWORK_CONF_OPT = CFLAGS="-I$(STAGING_DIR)/usr/include"
-# the above doesn't work with shared config.cache
-NG_SPICE_REWORK_USE_CONFIG_CACHE = NO
 
 NG_SPICE_REWORK_DEPENDENCIES = xserver_xorg-server xlib_libXaw
 
package/rpm/rpm.mk +0 -2
index 0104f17..778982a 100644
@@ -12,8 +12,6 @@ RPM_DEPENDENCIES = zlib beecrypt neon popt
 
 RPM_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/beecrypt -I$(STAGING_DIR)/usr/include/neon -DHAVE_MUTEX_THREAD_ONLY" \
 		ac_cv_va_copy=yes 
-# the above doesn't work with shared config.cache
-RPM_USE_CONFIG_CACHE = NO
 
 RPM_CONF_OPT = --disable-build-versionscript --disable-rpath \
 	--without-selinux \
package/sqlite/sqlite.mk +0 -2
index cc74fd7..847e77c 100644
@@ -15,8 +15,6 @@ ifneq ($(BR2_LARGEFILE),y)
 # --disable-largefile is passed, breaking the build. Work around it by
 # simply adding it to CFLAGS for configure instead
 SQLITE_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -DSQLITE_DISABLE_LFS"
-# changing CFLAGS doesn't work with config.cache
-SQLITE_USE_CONFIG_CACHE = NO
 endif
 
 SQLITE_CONF_OPT =	--enable-shared \
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +0 -1
index d9ea570..fed8c10 100644
@@ -11,7 +11,6 @@ XSERVER_XORG_SERVER_MAKE = $(MAKE1) # make install fails with parallel make
 XSERVER_XORG_SERVER_AUTORECONF = NO
 XSERVER_XORG_SERVER_LIBTOOL_PATCH = NO
 XSERVER_XORG_SERVER_INSTALL_STAGING = YES
-XSERVER_XORG_SERVER_USE_CONFIG_CACHE = NO # overrides CFLAGS
 XSERVER_XORG_SERVER_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install install-data
 
 XSERVER_XORG_SERVER_DEPENDENCIES = 	\
Signature · 1 line
1.7.0.4
#2 lore raw

PATCH 1/1 Remove support for shared configuration cache

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> The configuration cache shared between packages, while being in Thomas> principle a nice idea to speed-up the configuration of packages by Thomas> avoiding repetitive identical checks, turned out to be unreliable due Thomas> to the subtle differences between similar but not identical checks in Thomas> different packages. After spending some time trying to fix those, we Thomas> concluded that supporting the shared configuration cache is definitely Thomas> too hard and too unreliable, and that we'd better get rid of it Thomas> altogether.

Thomas> This patch therefore removes the shared configuration cache Thomas> infrastructure and usage.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard