From: Florian Fainelli Date: Sun, 26 Jul 2009 11:57:29 +0000 (+0000) Subject: [package] get the enable/disable ipv6 configure option from the build system, do... X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=cd44075a9573b9e7e7591d6ddd17b8eedfe44add [package] get the enable/disable ipv6 configure option from the build system, do not override it locally SVN-Revision: 17009 --- diff --git a/lang/php4/Makefile b/lang/php4/Makefile index 7303af34ef..51d48c20c0 100644 --- 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 \ diff --git a/lang/php5/Makefile b/lang/php5/Makefile index 2af653e2b8..ba7d7195c2 100644 --- 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 \ diff --git a/lang/python/Makefile b/lang/python/Makefile index a985babfbd..24a1b4ce7f 100644 --- 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 \ diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile index 1f0ff0ce8b..a3093fc445 100644 --- 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 += \ diff --git a/libs/apr/Makefile b/libs/apr/Makefile index 94f7426bce..85e5ce061f 100644 --- 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 \ diff --git a/libs/curl/Makefile b/libs/curl/Makefile index 574d248480..e1420e8fe6 100644 --- 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 \ diff --git a/libs/net-snmp/Makefile b/libs/net-snmp/Makefile index 2c374ddc7e..c960c35e8e 100644 --- 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/ \ diff --git a/libs/ptlib/Makefile b/libs/ptlib/Makefile index 795ba5a095..bac7a2e731 100644 --- 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 \ diff --git a/libs/pwlib/Makefile b/libs/pwlib/Makefile index e181201a3f..36c4ae6ebb 100644 --- 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 \ diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 21369055b3..35dba7c266 100644 --- 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 diff --git a/net/bind/Makefile b/net/bind/Makefile index 5432bf7990..a5bad70a78 100644 --- 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" \ diff --git a/net/elinks/Makefile b/net/elinks/Makefile index 4e94759297..d85027a12d 100644 --- 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 diff --git a/net/hiawatha/Makefile b/net/hiawatha/Makefile index 47b0374d82..374554fb5c 100644 --- 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 diff --git a/net/ipsec-tools/Makefile b/net/ipsec-tools/Makefile index d2b7f0441f..9267a742bd 100644 --- 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) diff --git a/net/irssi-glib1/Makefile b/net/irssi-glib1/Makefile index 8576d124a6..9752fe6264 100644 --- 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 diff --git a/net/irssi/Makefile b/net/irssi/Makefile index 126fe063cc..37cec9222e 100644 --- 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) diff --git a/net/ngrep/Makefile b/net/ngrep/Makefile index c02170adc3..5321f04129 100644 --- 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" \ diff --git a/net/quagga-unstable/Makefile b/net/quagga-unstable/Makefile index 087846dad5..9fa877f745 100644 --- 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 \ diff --git a/net/quagga/Makefile b/net/quagga/Makefile index 903f8da5cd..0815ebab4f 100644 --- 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 \ diff --git a/net/rsync/Makefile b/net/rsync/Makefile index 6589ac3058..8fc225edf2 100644 --- 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 \ diff --git a/net/tcpdump/Makefile b/net/tcpdump/Makefile index 587806cc73..41c88c86a0 100644 --- 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)" \ diff --git a/net/znc/Makefile b/net/znc/Makefile index 72e69fa54c..d04dbefbad 100644 --- 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" diff --git a/sound/mpd/Makefile b/sound/mpd/Makefile index e0732468bc..30165ce1fe 100644 --- 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 \ diff --git a/utils/sane-backends/Makefile b/utils/sane-backends/Makefile index cfc8cd8ba5..fc6bf3dd92 100644 --- 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 \