[package] get the enable/disable ipv6 configure option from the build system, do not override it locally

git-svn-id: svn://svn.openwrt.org/openwrt/packages@17009 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-07-26 11:57:29 +00:00 · 2009-07-26 11:57:29 +00:00 · 4de5143b4e
commit 4de5143b4e
parent e3ec1e30e8
24 changed files with 37 additions and 68 deletions
--- a/lang/php4/Makefile
+++ b/lang/php4/Makefile
@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2008 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=php4
 PKG_VERSION:=4.4.7
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=php-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://fr.php.net/distributions/
@ -157,7 +157,6 @@ PKG_CONFIGURE_OPTS:= \
 	--without-pear \
 	\
 	--with-config-file-path=/etc \
-	--disable-ipv6 \
 	--enable-magic-quotes \
 	--enable-memory-limit \
 	--disable-overload \
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006,2007 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=php
 PKG_VERSION:=5.2.6
-PKG_RELEASE:=2
+PKG_RELEASE:=3

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.php.net/distributions/
@ -203,7 +203,6 @@ PKG_CONFIGURE_OPTS:= \
 	--without-pear \
 	\
 	--with-config-file-path=/etc \
-	--disable-ipv6 \
 	--enable-magic-quotes \
 	--enable-memory-limit \
 	--disable-short-tags \
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2008 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=python
 PKG_VERSION:=2.6.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=Python-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.python.org/ftp/python/$(PKG_VERSION)/
@ -126,7 +126,6 @@ define Build/Compile
 	$(call Build/Configure/Default, \
 		--sysconfdir=/etc \
 		--disable-shared \
-		--disable-ipv6 \
 		--without-cxx-main \
 		--with-threads \
 		--with-system-ffi \
--- a/lang/ruby/Makefile
+++ b/lang/ruby/Makefile
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=ruby
 PKG_VERSION:=1.8.6-p287
-PKG_RELEASE:=3
+PKG_RELEASE:=4

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=ftp://ftp.ruby-lang.org/pub/ruby/1.8/
@ -178,7 +178,6 @@ CONFIGURE_ARGS += \
 	--enable-shared \
 	--enable-static \
 	--disable-rpath \
-	--enable-ipv6 \
 	--enable-wide-getaddrinfo \

 CONFIGURE_VARS += \
--- a/libs/apr/Makefile
+++ b/libs/apr/Makefile
@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007-2008 OpenWrt.org
+# Copyright (C) 2007-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=apr
 PKG_VERSION:=1.2.9
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://apache.d-s-s-p.de/apr/
@ -30,8 +30,7 @@ endef
 TARGET_CFLAGS += $(FPIC)
 CONFIGURE_ARGS += \
 	--with-devrandom=/dev/urandom \
-	--disable-dso \
-	--enable-ipv6
+	--disable-dso

 CONFIGURE_VARS += \
 	apr_cv_process_shared_works=no \
--- a/libs/curl/Makefile
+++ b/libs/curl/Makefile
@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=curl
 PKG_VERSION:=7.19.5
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://curl.haxx.se/download/ \
@ -57,7 +57,6 @@ CONFIGURE_ARGS += \
 	--enable-file \
 	--enable-ftp \
 	--enable-http \
-	--enable-ipv6 \
 	--disable-ares \
 	--disable-debug \
 	--disable-dict \
--- a/libs/net-snmp/Makefile
+++ b/libs/net-snmp/Makefile
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=net-snmp
 PKG_VERSION:=5.4.2.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/net-snmp
@ -150,7 +150,6 @@ TARGET_CFLAGS += $(FPIC)
 CONFIGURE_ARGS += \
 	--enable-shared \
 	--enable-static \
-	--enable-ipv6 \
 	--with-endianness=little \
 	--with-logfile=/var/log/snmpd.log \
 	--with-persistent-directory=/usr/lib/snmp/ \
--- a/libs/ptlib/Makefile
+++ b/libs/ptlib/Makefile
@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006-2007 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=ptlib
 PKG_VERSION:=2.2.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-src.tar.bz2
 PKG_SOURCE_URL:=@SF/opalvoip
@ -52,7 +52,6 @@ CONFIGURE_ARGS += \
 	--disable-ftp \
 	--disable-http \
 	--disable-httpsvc \
-	--disable-ipv6 \
 	--disable-jabber \
 	--disable-odbc \
 	--disable-openldap \
--- a/libs/pwlib/Makefile
+++ b/libs/pwlib/Makefile
@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006-2007 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=pwlib
 PKG_VERSION:=1.11.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=ftp://peternixon.net/pub/voxgratia
@ -50,7 +50,6 @@ CONFIGURE_ARGS += \
 	--disable-ftp \
 	--enable-http \
 	--disable-httpsvc \
-	--disable-ipv6 \
 	--disable-jabber \
 	--disable-openldap \
 	--disable-openssl \
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=ffmpeg
 PKG_VERSION:=20080419
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_NAME)-export-snapshot-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://downloads.openwrt.org/sources/
@ -176,13 +176,6 @@ FFMPEG_CONFIGURE_PROTOCOLS:= \
 		$(if $(CONFIG_FFMPEG_PROTOCOL_$(c)),--enable-protocol="$(c)") \
 	)

-ifneq ($(CONFIG_FFMPEG_PROTOCOL_IPv6),)
-	FFMPEG_CONFIGURE_IPv6:= --enable-ipv6
-else
-	FFMPEG_CONFIGURE_IPv6:= --disable-ipv6
-endif
-
-
 define Build/Configure
 	# this is *NOT* GNU configure
 	( cd $(PKG_BUILD_DIR); \
@ -221,7 +214,6 @@ define Build/Configure
 		--disable-bsfs \
 		--disable-protocols \
 		$(FFMPEG_CONFIGURE_PROTOCOLS) \
-		$(FFMPEG_CONFIGURE_IPv6) \
 	)
 endef

--- a/net/bind/Makefile
+++ b/net/bind/Makefile
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=bind
 PKG_VERSION:=9.5.0-P1
-PKG_RELEASE:=2
+PKG_RELEASE:=3

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:= \
@ -81,7 +81,6 @@ export BUILD_CC="$(TARGET_CC)"
 CONFIGURE_ARGS += \
 		--enable-shared \
 		--enable-static \
-		--enable-ipv6 \
 		--with-randomdev="/dev/urandom" \
 		--disable-threads \
 		--with-openssl="$(STAGING_DIR)/usr" \
--- a/net/elinks/Makefile
+++ b/net/elinks/Makefile
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=elinks
 PKG_VERSION:=0.11.6
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://elinks.or.cz/download
@ -79,7 +79,6 @@ define Build/Configure
                        --without-spidermonkey\
                        --without-x\
                        --without-zlib \
-                        --disable-ipv6 \
 	);
 endef

--- a/net/hiawatha/Makefile
+++ b/net/hiawatha/Makefile
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=hiawatha
 PKG_VERSION:=6.15
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.hiawatha-webserver.org/files/
@ -32,8 +32,7 @@ endef

 CONFIGURE_ARGS+= \
 	--disable-cache \
-	--disable-ssl \
-	--disable-ipv6
+	--disable-ssl

 CONFIGURE_VARS+= \
 	ac_cv_file__dev_urandom=yes
--- a/net/ipsec-tools/Makefile
+++ b/net/ipsec-tools/Makefile
@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk

 PKG_NAME:=ipsec-tools
 PKG_VERSION:=0.7.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/ipsec-tools
@ -38,8 +38,7 @@ CONFIGURE_ARGS += \
 	--enable-hybrid \
 	--enable-security-context=no \
 	--enable-natt \
-	--enable-adminport \
-	--enable-ipv6
+	--enable-adminport

 define Build/Prepare
 	$(call Build/Prepare/Default)
--- a/net/irssi-glib1/Makefile
+++ b/net/irssi-glib1/Makefile
@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=irssi-glib1
 PKG_VERSION:=0.8.10
-PKG_RELEASE:=2
+PKG_RELEASE:=3

 PKG_SOURCE:=irssi-$(PKG_VERSION)a.tar.bz2
 PKG_SOURCE_URL:=http://irssi.org/files/
@ -39,7 +39,6 @@ define Build/Configure
 		--without-file-offset-size \
 		--without-ssl \
 		--disable-ssl \
-		--enable-ipv6 \
 		--disable-proxy \
 	)
 endef
--- a/net/irssi/Makefile
+++ b/net/irssi/Makefile
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=irssi
 PKG_VERSION:=0.8.13
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://irssi.org/files/
@ -62,7 +62,6 @@ $(STAMP_BUILT)-$(2): $(STAMP_PREPARED)
 		--without-terminfo \
 		--without-bot \
 		--without-file-offset-size \
-		--disable-ipv6 \
 		--disable-proxy \
 		$(3))
 	$(MAKE) -C $(PKG_BUILD_DIR)
--- a/net/ngrep/Makefile
+++ b/net/ngrep/Makefile
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=ngrep
 PKG_VERSION:=1.45
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/ngrep
@ -39,7 +39,6 @@ define Build/Configure
 		--with-pcap-includes=$(STAGING_DIR)/usr/include \
 		--enable-pcre \
 		--with-pcre=$(STAGING_DIR)/usr \
-		--enable-ipv6 \
 		--disable-dropprivs \
 		,\
 		LDFLAGS="$(TARGET_LDFLAGS) -lpcre" \
--- a/net/quagga-unstable/Makefile
+++ b/net/quagga-unstable/Makefile
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=quagga-unstable
 PKG_VERSION:=0.99.14
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MD5SUM:=3a075fd5e26ec6d52f4a51b14a2d3c2c

 PKG_SOURCE_URL:=http://www.quagga.net/download/ \
@ -97,7 +97,6 @@ define Build/Configure
 		--sysconfdir=/etc/quagga/ \
 		--enable-shared \
 		--disable-static \
-		--enable-ipv6 \
 		--enable-vtysh \
 		--enable-user=quagga \
 		--enable-group=quagga \
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=quagga
 PKG_VERSION:=0.98.6
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_MD5SUM:=b0d4132039953a0214256873b7d23d68

 PKG_SOURCE_URL:=http://www.quagga.net/download/ \
@ -96,7 +96,6 @@ define Build/Configure
 		--sysconfdir=/etc/quagga/ \
 		--enable-shared \
 		--disable-static \
-		--enable-ipv6 \
 		--enable-vtysh \
 		--enable-user=quagga \
 		--enable-group=quagga \
--- a/net/rsync/Makefile
+++ b/net/rsync/Makefile
@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007-2008 OpenWrt.org
+# Copyright (C) 2007-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=rsync
 PKG_VERSION:=3.0.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://rsync.samba.org/ftp/rsync
@ -41,7 +41,6 @@ endef
 CONFIGURE_ARGS += \
 	--with-included-popt=no \
 	--disable-debug \
-	--disable-ipv6 \
 	--disable-locale \
 	--disable-xattr-support \
 	--disable-acl-support \
--- a/net/tcpdump/Makefile
+++ b/net/tcpdump/Makefile
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=tcpdump
 PKG_VERSION:=3.9.8
-PKG_RELEASE:=2
+PKG_RELEASE:=3

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.tcpdump.org/release/ \
@ -30,7 +30,6 @@ endef

 define Build/Configure
 	$(call Build/Configure/Default, \
-		--enable-ipv6 \
 		--without-crypto \
 		, \
 		BUILD_CC="$(TARGET_CC)" \
--- a/net/znc/Makefile
+++ b/net/znc/Makefile
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=znc
 PKG_VERSION:=0.070
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/znc
@ -42,7 +42,6 @@ CONFIGURE_VARS += \
 CONFIGURE_ARGS += \
 	$(TARGET_CONFIGURE_OPTS) \
 	--disable-perl \
-	--disable-ipv6 \

 MAKE_FLAGS += \
 	CXX="g++-uc"
--- a/sound/mpd/Makefile
+++ b/sound/mpd/Makefile
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=mpd
 PKG_VERSION:=0.15.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/musicpd
@ -60,7 +60,6 @@ define Build/Configure
 		--disable-mpc \
 		--disable-aac \
 		--disable-lsr \
-		--disable-ipv6 \
 		--disable-ao \
 		--disable-mvp \
 		--disable-lametest \
--- a/utils/sane-backends/Makefile
+++ b/utils/sane-backends/Makefile
@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2008 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=sane-backends
 PKG_VERSION:=1.0.19
-PKG_RELEASE:=2
+PKG_RELEASE:=3

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.sane-project.org/pub/sane/$(PKG_NAME)-$(PKG_VERSION)/
@ -68,7 +68,6 @@ endef
 CONFIGURE_ARGS+= \
 	--enable-shared \
 	--enable-static \
-	--disable-ipv6 \
 	--disable-translations \
 	--without-gphoto2 \
 	--disable-debug \