diff options
Diffstat (limited to 'package')
-rw-r--r-- | package/Makefile.autotools.in | 3 | ||||
-rw-r--r-- | package/fontconfig/fontconfig.mk | 1 | ||||
-rw-r--r-- | package/gamin/gamin.mk | 2 | ||||
-rw-r--r-- | package/haserl/haserl.mk | 2 | ||||
-rw-r--r-- | package/libxml2/libxml2.mk | 2 | ||||
-rw-r--r-- | package/multimedia/alsa-lib/alsa-lib.mk | 2 | ||||
-rw-r--r-- | package/ng-spice-rework/ng-spice-rework.mk | 2 | ||||
-rw-r--r-- | package/rpm/rpm.mk | 2 | ||||
-rw-r--r-- | package/sqlite/sqlite.mk | 2 | ||||
-rw-r--r-- | package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 1 |
10 files changed, 0 insertions, 19 deletions
diff --git a/package/Makefile.autotools.in b/package/Makefile.autotools.in index 3e2136937..7d04e4401 100644 --- a/package/Makefile.autotools.in +++ b/package/Makefile.autotools.in @@ -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) \ diff --git a/package/fontconfig/fontconfig.mk b/package/fontconfig/fontconfig.mk index 6cbe2eafe..a875e7490 100644 --- a/package/fontconfig/fontconfig.mk +++ b/package/fontconfig/fontconfig.mk @@ -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. diff --git a/package/gamin/gamin.mk b/package/gamin/gamin.mk index db2769213..f0600b27c 100644 --- a/package/gamin/gamin.mk +++ b/package/gamin/gamin.mk @@ -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 diff --git a/package/haserl/haserl.mk b/package/haserl/haserl.mk index 79f02410f..a8585e827 100644 --- a/package/haserl/haserl.mk +++ b/package/haserl/haserl.mk @@ -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) diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index 820f4656d..387dce3c5 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -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 \ diff --git a/package/multimedia/alsa-lib/alsa-lib.mk b/package/multimedia/alsa-lib/alsa-lib.mk index ee9d9bc5d..a3d5fe4a8 100644 --- a/package/multimedia/alsa-lib/alsa-lib.mk +++ b/package/multimedia/alsa-lib/alsa-lib.mk @@ -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* diff --git a/package/ng-spice-rework/ng-spice-rework.mk b/package/ng-spice-rework/ng-spice-rework.mk index 7515d255d..113b59dee 100644 --- a/package/ng-spice-rework/ng-spice-rework.mk +++ b/package/ng-spice-rework/ng-spice-rework.mk @@ -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 diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk index 0104f1719..778982a72 100644 --- a/package/rpm/rpm.mk +++ b/package/rpm/rpm.mk @@ -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 \ diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index cc74fd74e..847e77c8e 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -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 \ diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index d9ea57083..fed8c10f8 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -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 = \ |