package: remove redundant DISABLE_{IPV6,NLS,LARGEFILE} configure args

Makefile.autotools.in automatically adds these to the configure invocation,
so there's no need to explicitly list them.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Peter Korsgaard 2010-03-22 14:29:00 +01:00
parent 6a3a58f137
commit a96be19bc3
14 changed files with 9 additions and 28 deletions

View File

@ -16,7 +16,7 @@ BIND_TARGET_BINS = dig host nslookup nsupdate
BIND_TARGET_LIBS = libbind9.* libdns.* libisccc.* libisccfg.* libisc.* liblwres.*
BIND_CONF_ENV = BUILD_CC="$(TARGET_CC)" \
BUILD_CFLAGS="$(TARGET_CFLAGS)"
BIND_CONF_OPT = $(DISABLE_IPV6) \
BIND_CONF_OPT = \
--sysconfdir=/etc \
--localstatedir=/var \
--with-randomdev=/dev/urandom \

View File

@ -21,9 +21,7 @@ E2FSPROGS_CONF_OPT = \
--disable-resizer \
--enable-fsck \
--disable-e2initrd-helper \
--disable-testio-debug \
$(DISABLE_NLS) \
$(DISABLE_LARGEFILE)
--disable-testio-debug
E2FSPROGS_MAKE_OPT = \
LDCONFIG=true

View File

@ -12,8 +12,7 @@ LXDOOM_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
LXDOOM_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) --prefix=/usr \
--includedir=/usr/include --enable-shared \
$(DISABLE_NLS)
--includedir=/usr/include --enable-shared
LXDOOM_DEPENDENCIES = xserver_xorg-server

View File

@ -6,8 +6,7 @@
GREP_VERSION:=2.5.3
GREP_SOURCE:=grep-$(GREP_VERSION).tar.bz2
GREP_SITE:=$(BR2_GNU_MIRROR)/grep
GREP_CONF_OPT = --disable-perl-regexp --without-included-regex \
$(DISABLE_NLS) $(DISABLE_LARGEFILE)
GREP_CONF_OPT = --disable-perl-regexp --without-included-regex
GREP_DEPENDENCIES = $(if $(BR2_ENABLE_LOCALE),gettext libintl)

View File

@ -7,8 +7,7 @@ LIBCURL_VERSION = 7.19.2
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_IPV6)
LIBCURL_CONF_OPT = --disable-verbose --disable-manual --enable-hidden-symbols
ifeq ($(BR2_PACKAGE_OPENSSL),y)
LIBCURL_DEPENDENCIES += openssl

View File

@ -18,9 +18,9 @@ LIBXML2_USE_CONFIG_CACHE = NO
endif
LIBXML2_CONF_OPT = --with-gnu-ld --enable-shared \
--enable-static $(DISABLE_IPV6) \
--enable-static \
--without-debugging --without-python \
--without-threads
--without-threads
HOST_LIBXML2_DEPENDENCIES = host-pkg-config

View File

@ -18,7 +18,6 @@ endif
LIBXSLT_CONF_OPT = --with-gnu-ld --enable-shared \
--enable-static $(LIBXSLT_XTRA_CONF_OPT) \
$(DISABLE_NLS) $(DISABLE_IPV6) \
--without-debugging --without-python \
--without-threads \
--with-libxml-prefix=$(STAGING_DIR)/usr/

View File

@ -8,17 +8,12 @@ LIGHTTPD_VERSION = 1.4.26
LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-1.4.x
LIGHTTPD_LIBTOOL_PATCH = NO
ifneq ($(BR2_LARGEFILE),y)
LIGHTTPD_LFS:=$(DISABLE_LARGEFILE) --disable-lfs
endif
LIGHTTPD_CONF_OPT = \
--libdir=/usr/lib/lighttpd \
--libexecdir=/usr/lib \
--localstatedir=/var \
--program-prefix="" \
$(DISABLE_IPV6) \
$(LIGHTTPD_LFS)
$(if $(BR2_LARGEFILE),,--disable-lfs)
ifeq ($(BR2_PACKAGE_LIGHTTPD_OPENSSL),y)
LIGHTTPD_DEPENDENCIES += openssl

View File

@ -9,8 +9,6 @@ GST_PLUGINS_BAD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-bad
GST_PLUGINS_BAD_LIBTOOL_PATCH = NO
GST_PLUGINS_BAD_CONF_OPT = \
$(DISABLE_NLS) \
$(DISABLE_LARGEFILE) \
--disable-examples
GST_PLUGINS_BAD_DEPENDENCIES = gst-plugins-base gstreamer liboil

View File

@ -15,8 +15,6 @@ GST_PLUGINS_BASE_LIBTOOL_PATCH = NO
GST_PLUGINS_BASE_CONF_ENV = FT2_CONFIG=/bin/false
GST_PLUGINS_BASE_CONF_OPT = \
$(DISABLE_NLS) \
$(DISABLE_LARGEFILE) \
--disable-examples \
--disable-x \
--disable-xvideo \

View File

@ -9,7 +9,6 @@ GST_PLUGINS_GOOD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-good
GST_PLUGINS_GOOD_LIBTOOL_PATCH = NO
GST_PLUGINS_GOOD_CONF_OPT = \
$(DISABLE_NLS) \
--disable-debug \
--disable-examples \
--disable-directsound \

View File

@ -9,7 +9,6 @@ GST_PLUGINS_UGLY_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-ugly
GST_PLUGINS_UGLY_LIBTOOL_PATCH = NO
GST_PLUGINS_UGLY_CONF_OPT = \
$(DISABLE_NLS) \
--disable-examples
GST_PLUGINS_UGLY_DEPENDENCIES = gstreamer gst-plugins-base

View File

@ -12,8 +12,7 @@ PHP_INSTALL_STAGING_OPT = INSTALL_ROOT=$(STAGING_DIR) install
PHP_INSTALL_TARGET_OPT = INSTALL_ROOT=$(TARGET_DIR) install
PHP_LIBTOOL_PATCH = NO
PHP_DEPENDENCIES =
PHP_CONF_OPT = $(DISABLE_IPV6) \
--mandir=/usr/share/man \
PHP_CONF_OPT = --mandir=/usr/share/man \
--infodir=/usr/share/info \
--disable-all \
--without-pear \

View File

@ -6,7 +6,6 @@
WGET_VERSION = 1.12
WGET_SITE = $(BR2_GNU_MIRROR)/wget
WGET_CONF_OPT = $(DISABLE_IPV6)
ifeq ($(BR2_PACKAGE_OPENSSL),y)
WGET_CONF_OPT += --with-ssl --with-libssl-prefix=$(STAGING_DIR)