[meta-networking][PATCH] ipsec-tools: fix dependencies and enable two configuration

[meta-networking][PATCH] ipsec-tools: fix dependencies and enable two configuration

[rongqing.li]

From: "Roy.Li" <rongqing.li@windriver.com>

ipsec-tools depends on bison-native
enable ipv6 support by DISTRO_FEATURE, and enable shared library support.

Signed-off-by: Roy.Li <rongqing.li@windriver.com>
---
 meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.1.bb |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.1.bb b/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.1.bb
index ef753c0..c44d374 100644
--- a/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.1.bb
+++ b/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.1.bb
@@ -5,7 +5,7 @@ SECTION = "console/network"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://src/libipsec/pfkey.c;beginline=6;endline=31;md5=bc9b7ff40beff19fe6bc6aef26bd2b24"
 
-DEPENDS = "virtual/kernel openssl readline flex"
+DEPENDS = "virtual/kernel openssl readline flex bison-native"
 
 SRC_URI = "ftp://ftp.netbsd.org/pub/NetBSD/misc/ipsec-tools/0.8/ipsec-tools-${PV}.tar.bz2 \
            file://0001-Fix-warning-with-gcc-4.8.patch \
@@ -46,7 +46,9 @@ EXTRA_OECONF = "--with-kernel-headers=${STAGING_INCDIR} \
                 --without-libradius \
                 --without-gssapi \
                 --without-libpam \
-                --disable-security-context"
+                --disable-security-context \
+                --enable-shared \
+                ${@base_contains('DISTRO_FEATURES', 'ipv6', '--enable-ipv6=yes', '', d)}"
 
 # See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=530527
 CFLAGS += "-fno-strict-aliasing"
-- 
1.7.10.4

Re: [meta-networking][PATCH] ipsec-tools: fix dependencies and enable two configuration

[Joe MacDonald]

[-- Attachment #1: Type: text/plain, Size: 1896 bytes --]

Merged, thanks.
-J.

[[meta-networking][PATCH] ipsec-tools: fix dependencies and enable two configuration] On 13.07.16 (Tue 14:38) rongqing.li@windriver.com wrote:

> From: "Roy.Li" <rongqing.li@windriver.com>
> 
> ipsec-tools depends on bison-native
> enable ipv6 support by DISTRO_FEATURE, and enable shared library support.
> 
> Signed-off-by: Roy.Li <rongqing.li@windriver.com>
> ---
>  meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.1.bb |    6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.1.bb b/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.1.bb
> index ef753c0..c44d374 100644
> --- a/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.1.bb
> +++ b/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.1.bb
> @@ -5,7 +5,7 @@ SECTION = "console/network"
>  LICENSE = "BSD"
>  LIC_FILES_CHKSUM = "file://src/libipsec/pfkey.c;beginline=6;endline=31;md5=bc9b7ff40beff19fe6bc6aef26bd2b24"
>  
> -DEPENDS = "virtual/kernel openssl readline flex"
> +DEPENDS = "virtual/kernel openssl readline flex bison-native"
>  
>  SRC_URI = "ftp://ftp.netbsd.org/pub/NetBSD/misc/ipsec-tools/0.8/ipsec-tools-${PV}.tar.bz2 \
>             file://0001-Fix-warning-with-gcc-4.8.patch \
> @@ -46,7 +46,9 @@ EXTRA_OECONF = "--with-kernel-headers=${STAGING_INCDIR} \
>                  --without-libradius \
>                  --without-gssapi \
>                  --without-libpam \
> -                --disable-security-context"
> +                --disable-security-context \
> +                --enable-shared \
> +                ${@base_contains('DISTRO_FEATURES', 'ipv6', '--enable-ipv6=yes', '', d)}"
>  
>  # See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=530527
>  CFLAGS += "-fno-strict-aliasing"
-- 
-Joe MacDonald.
:wq

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]