From c86f23b7708cb7eeba91a2764210277c78143dca Mon Sep 17 00:00:00 2001 From: Thomas Lundquist Date: Sun, 18 Jan 2009 09:26:28 +0000 Subject: [PATCH] Getting rid of a bit more configure options that's been centralized. --- package/bridge-utils/bridge.mk | 2 +- package/gmpc/gmpc.mk | 2 +- package/libconfuse/libconfuse.mk | 2 +- package/libcurl/libcurl.mk | 2 +- package/libdaemon/libdaemon.mk | 2 +- package/libgtk2/libgtk2.mk | 1 - package/libxml2/libxml2.mk | 2 +- package/lzo/lzo.mk | 1 - package/multimedia/gstreamer/gstreamer.mk | 2 -- package/multimedia/speex/speex.mk | 2 +- package/netcat/netcat.mk | 1 - package/psmisc/psmisc.mk | 2 +- package/rpm/rpm.mk | 3 +-- 13 files changed, 9 insertions(+), 15 deletions(-) diff --git a/package/bridge-utils/bridge.mk b/package/bridge-utils/bridge.mk index 404d268a0b..f499357268 100644 --- a/package/bridge-utils/bridge.mk +++ b/package/bridge-utils/bridge.mk @@ -11,7 +11,7 @@ BRIDGE_AUTORECONF:=YES BRIDGE_INSTALL_STAGING:=NO BRIDGE_INSTALL_TARGET:=YES BRIDGE_INSTALL_TARGET_OPT:=DESTDIR=$(TARGET_DIR) install -BRIDGE_CONF_OPT:=--with-linux-headers=$(LINUX_HEADERS_DIR) $(DISABLE_NLS) +BRIDGE_CONF_OPT:=--with-linux-headers=$(LINUX_HEADERS_DIR) BRIDGE_DEPENDENCIES:=uclibc $(eval $(call AUTOTARGETS,package,bridge)) diff --git a/package/gmpc/gmpc.mk b/package/gmpc/gmpc.mk index 71ba620385..52cb3d6851 100644 --- a/package/gmpc/gmpc.mk +++ b/package/gmpc/gmpc.mk @@ -8,7 +8,7 @@ GMPC_SOURCE = gmpc-$(GMPC_VERSION).tar.gz GMPC_SITE = http://download.sarine.nl/download/Programs/gmpc/$(GMPC_VERSION)/ GMPC_LIBTOOL_PATCH = NO GMPC_CONF_ENV = ac_cv_lib_curl_curl_global_init=yes -GMPC_CONF_OPT = --disable-mmkeys $(DISABLE_NLS) +GMPC_CONF_OPT = --disable-mmkeys GMPC_DEPENDENCIES = libglib2 libgtk2 libglade libcurl libmpd diff --git a/package/libconfuse/libconfuse.mk b/package/libconfuse/libconfuse.mk index 552b7c73e1..178f6d73f5 100644 --- a/package/libconfuse/libconfuse.mk +++ b/package/libconfuse/libconfuse.mk @@ -10,7 +10,7 @@ LIBCONFUSE_AUTORECONF:=NO LIBCONFUSE_INSTALL_STAGING:=YES LIBCONFUSE_INSTALL_TARGET:=YES -LIBCONFUSE_CONF_OPT:=--enable-shared --disable-rpath $(DISABLE_NLS) +LIBCONFUSE_CONF_OPT:=--enable-shared --disable-rpath LIBCONFUSE_DEPENDENCIES = uclibc diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index d62a0e9fd7..6a91bb2623 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -8,7 +8,7 @@ LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2 LIBCURL_SITE = http://curl.haxx.se/download/ LIBCURL_INSTALL_STAGING = YES LIBCURL_CONF_OPT = --disable-verbose --disable-manual --enable-hidden-symbols \ - $(DISABLE_NLS) $(DISABLE_LARGEFILE) $(DISABLE_IPV6) + $(DISABLE_IPV6) ifeq ($(BR2_PACKAGE_OPENSSL),y) LIBCURL_DEPENDENCIES += openssl diff --git a/package/libdaemon/libdaemon.mk b/package/libdaemon/libdaemon.mk index 39e39fc243..abc1556cb9 100644 --- a/package/libdaemon/libdaemon.mk +++ b/package/libdaemon/libdaemon.mk @@ -11,7 +11,7 @@ LIBDAEMON_AUTORECONF:=no LIBDAEMON_INSTALL_STAGING:=YES LIBDAEMON_INSTALL_TARGET:=YES LIBDAEMON_CONF_ENV:=ac_cv_func_setpgrp_void=no -LIBDAEMON_CONF_OPT:=--disable-lynx $(DISABLE_NLS) $(DISABLE_LARGEFILE) +LIBDAEMON_CONF_OPT:=--disable-lynx LIBDAEMON_DEPENDENCIES:=uclibc pkgconfig diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk index 57a0b90ac8..a06da31b3a 100644 --- a/package/libgtk2/libgtk2.mk +++ b/package/libgtk2/libgtk2.mk @@ -75,7 +75,6 @@ LIBGTK2_CONF_OPT = --enable-shared \ --disable-glibtest \ --enable-explicit-deps=no \ --disable-debug \ - $(DISABLE_LARGEFILE) \ $(LIBGTK2_CONF_OPT_X) \ $(LIBGTK2_CONF_OPT_DFB) diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index 5c31087a00..adc43f51d9 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -16,7 +16,7 @@ endif LIBXML2_CONF_OPT = --with-gnu-ld --enable-shared \ --enable-static $(DISABLE_IPV6) \ --without-debugging --without-python \ - --without-threads $(DISABLE_NLS) + --without-threads LIBXML2_DEPENDENCIES = uclibc diff --git a/package/lzo/lzo.mk b/package/lzo/lzo.mk index 78835069c0..aa9c69d78f 100644 --- a/package/lzo/lzo.mk +++ b/package/lzo/lzo.mk @@ -11,7 +11,6 @@ LZO_INSTALL_STAGING = YES LZO_INSTALL_TARGET = YES LZO_INSTALL_STAGING_OPT = CC="$(TARGET_CC)" DESTDIR=$(STAGING_DIR) install LZO_CONF_ENV = -LZO_CONF_OPT = $(DISABLE_LARGEFILE) LZO_DEPENDENCIES = uclibc $(eval $(call AUTOTARGETS,package,lzo)) diff --git a/package/multimedia/gstreamer/gstreamer.mk b/package/multimedia/gstreamer/gstreamer.mk index 3d4033e199..fb9a3b9109 100644 --- a/package/multimedia/gstreamer/gstreamer.mk +++ b/package/multimedia/gstreamer/gstreamer.mk @@ -19,8 +19,6 @@ GSTREAMER_CONF_ENV = as_cv_unaligned_access=no endif GSTREAMER_CONF_OPT = \ - $(DISABLE_NLS) \ - $(DISABLE_LARGEFILE) \ --disable-examples \ --disable-tests \ --disable-failing-tests diff --git a/package/multimedia/speex/speex.mk b/package/multimedia/speex/speex.mk index 7473557ae9..6943ad7305 100644 --- a/package/multimedia/speex/speex.mk +++ b/package/multimedia/speex/speex.mk @@ -12,7 +12,7 @@ SPEEX_INSTALL_TARGET = YES SPEEX_DEPENDENCIES = libogg SPEEX_CONF_OPT = --with-ogg-libraries=$(STAGING_DIR)/usr/lib \ --with-ogg-includes=$(STAGING_DIR)/usr/include \ - --enable-fixed-point $(DISABLE_NLS) + --enable-fixed-point ifeq ($(BR2_PACKAGE_SPEEX_ARM4),y) SPEEX_CONF_OPT += --enable-arm4-asm diff --git a/package/netcat/netcat.mk b/package/netcat/netcat.mk index 9c19be2b34..33d8dcd93c 100644 --- a/package/netcat/netcat.mk +++ b/package/netcat/netcat.mk @@ -10,7 +10,6 @@ NETCAT_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/netc NETCAT_AUTORECONF:=NO NETCAT_INSTALL_STAGING:=NO NETCAT_INSTALL_TARGET:=YES -NETCAT_CONF_OPT:= $(DISABLE_NLS) NETCAT_DEPENDENCIES = uclibc diff --git a/package/psmisc/psmisc.mk b/package/psmisc/psmisc.mk index ce55667288..e0f82c9046 100644 --- a/package/psmisc/psmisc.mk +++ b/package/psmisc/psmisc.mk @@ -11,7 +11,7 @@ PSMISC_INSTALL_STAGING:=no PSMISC_INSTALL_TARGET:=YES PSMISC_CONF_ENV:=ac_cv_func_malloc_0_nonnull=yes \ ac_cv_func_realloc_0_nonnull=yes -PSMISC_CONF_OPT:= $(DISABLE_NLS) $(DISABLE_IPV6) +PSMISC_CONF_OPT:= $(DISABLE_IPV6) PSMISC_DEPENDENCIES:=uclibc ncurses ifeq ($(BR2_ENABLE_LOCALE),y) diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk index 2b83b64810..e769a050f4 100644 --- a/package/rpm/rpm.mk +++ b/package/rpm/rpm.mk @@ -20,8 +20,7 @@ RPM_CONF_OPT = --disable-build-versionscript --disable-rpath \ --with-libbeecrypt=$(STAGING_DIR) \ --with-popt=$(STAGING_DIR) \ --with-mutex=UNIX/fcntl \ - --with-bzip2 \ - $(DISABLE_NLS) + --with-bzip2 RPM_MAKE_OPT = -j1 -- 2.30.2