[oe-commits] Ryan D Phillips : bind: Add DISTRO_FEATURES support for ipv6

[git version control]

Module: openembedded.git
Branch: ulf/linux-2.6.30-2011-01-16
Commit: 624b35abceb68ca6dc17791faa830b000d25b8b7
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=624b35abceb68ca6dc17791faa830b000d25b8b7

Author: Ryan D Phillips <ryan_d_phillips at dell.com>
Date:   Fri Jan 28 00:10:45 2011 +0000

bind: Add DISTRO_FEATURES support for ipv6

Signed-off-by: Ryan D Phillips <ryan_d_phillips at dell.com>
Signed-off-by: Tom Rini <tom_rini at mentor.com>

---

 recipes/bind/bind_9.3.1.bb    |    6 ++++--
 recipes/bind/bind_9.3.4-P1.bb |    6 ++++--
 recipes/bind/bind_9.3.5-P1.bb |    6 ++++--
 recipes/bind/bind_9.3.6.bb    |    7 +++++--
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/recipes/bind/bind_9.3.1.bb b/recipes/bind/bind_9.3.1.bb
index 268253e..11d4c71 100644
--- a/recipes/bind/bind_9.3.1.bb
+++ b/recipes/bind/bind_9.3.1.bb
@@ -1,7 +1,7 @@
 DEPENDS = "openssl"
 RPEDENDS = ""
 DESCRIPTION = "ISC Internet Domain Name Server"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.isc.org/isc/bind9/9.3.1/bind-9.3.1.tar.gz \
            file://lib_dns_Makefile.in.patch \
@@ -9,7 +9,9 @@ SRC_URI = "ftp://ftp.isc.org/isc/bind9/9.3.1/bind-9.3.1.tar.gz \
 	   file://conf.patch \
 	   "
 
-EXTRA_OECONF = " --enable-ipv6=no --with-randomdev=/dev/random --disable-threads --sysconfdir=/etc/bind --localstatedir=/var --prefix=/usr"
+EXTRA_OECONF = "--with-randomdev=/dev/random --disable-threads \
+                --sysconfdir=/etc/bind --localstatedir=/var --prefix=/usr \
+                ${@base_contains('DISTRO_FEATURES', 'ipv6', '--enable-ipv6=yes', '--enable-ipv6=no', d)}"
 inherit autotools update-rc.d
 
 INITSCRIPT_NAME = "bind"
diff --git a/recipes/bind/bind_9.3.4-P1.bb b/recipes/bind/bind_9.3.4-P1.bb
index 70c261e..f8ae48f 100644
--- a/recipes/bind/bind_9.3.4-P1.bb
+++ b/recipes/bind/bind_9.3.4-P1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "ISC Internet Domain Name Server"
 SECTION = "console/network"
 HOMEPAGE = "http://www.isc.org/sw/bind/"
 LICENSE = "BSD"
-PR = "r0"
+PR = "r1"
 
 DEPENDS = "openssl"
 
@@ -12,7 +12,9 @@ SRC_URI = "ftp://ftp.isc.org/isc/bind9/9.3.4-P1/bind-9.3.4-P1.tar.gz \
 	   file://so_bsdcompat.patch \
 	   "
 
-EXTRA_OECONF = " --enable-ipv6=no --with-randomdev=/dev/random --disable-threads --sysconfdir=/etc/bind --localstatedir=/var --prefix=/usr"
+EXTRA_OECONF = "--with-randomdev=/dev/random --disable-threads \
+                --sysconfdir=/etc/bind --localstatedir=/var --prefix=/usr \
+                ${@base_contains('DISTRO_FEATURES', 'ipv6', '--enable-ipv6=yes', '--enable-ipv6=no', d)}"
 inherit autotools update-rc.d
 
 INITSCRIPT_NAME = "bind"
diff --git a/recipes/bind/bind_9.3.5-P1.bb b/recipes/bind/bind_9.3.5-P1.bb
index bb98261..f573e57 100644
--- a/recipes/bind/bind_9.3.5-P1.bb
+++ b/recipes/bind/bind_9.3.5-P1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "ISC Internet Domain Name Server"
 SECTION = "console/network"
 HOMEPAGE = "http://www.isc.org/sw/bind/"
 LICENSE = "BSD"
-PR = "r0"
+PR = "r1"
 
 DEPENDS = "openssl"
 
@@ -12,7 +12,9 @@ SRC_URI = "ftp://ftp.isc.org/isc/bind9/9.3.5-P1/bind-9.3.5-P1.tar.gz \
 	   file://so_bsdcompat.patch \
 	   "
 
-EXTRA_OECONF = " --enable-ipv6=no --with-randomdev=/dev/random --disable-threads --sysconfdir=/etc/bind --localstatedir=/var --prefix=/usr"
+EXTRA_OECONF = "--with-randomdev=/dev/random --disable-threads \
+                --sysconfdir=/etc/bind --localstatedir=/var --prefix=/usr \
+                ${@base_contains('DISTRO_FEATURES', 'ipv6', '--enable-ipv6=yes', '--enable-ipv6=no', d)}"
 inherit autotools update-rc.d
 
 INITSCRIPT_NAME = "bind"
diff --git a/recipes/bind/bind_9.3.6.bb b/recipes/bind/bind_9.3.6.bb
index b10d6e8..2ea37f9 100644
--- a/recipes/bind/bind_9.3.6.bb
+++ b/recipes/bind/bind_9.3.6.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "ISC Internet Domain Name Server"
 SECTION = "console/network"
 HOMEPAGE = "http://www.isc.org/sw/bind/"
 LICENSE = "BSD"
-PR = "r1"
+PR = "r2"
 
 DEPENDS = "openssl"
 
@@ -11,7 +11,10 @@ SRC_URI = "ftp://ftp.isc.org/isc/bind9/${PV}/${PN}-${PV}.tar.gz \
 	   file://configure.in.patch \
 	   "
 
-EXTRA_OECONF = " --enable-ipv6=no --with-randomdev=/dev/random --disable-threads --sysconfdir=/etc/bind --localstatedir=/var --prefix=/usr --disable-devpoll --disable-epoll"
+EXTRA_OECONF = "--with-randomdev=/dev/random --disable-threads \
+                --sysconfdir=/etc/bind --localstatedir=/var --prefix=/usr --disable-devpoll \
+                --disable-epoll \
+                ${@base_contains('DISTRO_FEATURES', 'ipv6', '--enable-ipv6=yes', '--enable-ipv6=no', d)}"
 inherit autotools update-rc.d
 
 INITSCRIPT_NAME = "bind"