From patchwork Tue Jun 26 21:50:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [oe-classic, 1/1] openssl_1.0.0e: fix build issue for hosts without ipv6 Date: Tue, 26 Jun 2012 21:50:47 -0000 From: Apelete Seketeli X-Patchwork-Id: 30671 Message-Id: <1340747447-17919-2-git-send-email-apelete@seketeli.net> To: openembedded-devel@lists.openembedded.org Cc: Kristoffer Ericson This patch fixes an issue where some ipv6 code was injected into the bss_dgram.c regardless of the ipv6 availability of the host. The code is now injected only if the host is ipv6 enabled. Signed-off-by: Apelete Seketeli --- recipes/openssl/openssl.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes/openssl/openssl.inc b/recipes/openssl/openssl.inc index 2aff24a..d45fca9 100644 --- a/recipes/openssl/openssl.inc +++ b/recipes/openssl/openssl.inc @@ -106,7 +106,10 @@ do_configure () { perl ./Configure ${EXTRA_OECONF} shared --prefix=$useprefix --openssldir=${libdir}/ssl $target eval "${@base_contains('DISTRO_FEATURES', 'largefile', '', 'sed -i -e "/_FILE_OFFSET_BITS/,/#endif/d" ${S}/crypto/bio/bss_file.c', d)}" - eval "${@base_contains('DISTRO_FEATURES', 'ipv6', '', 'sed -i -e "/AF_INET6/,/break/d" ${S}/crypto/bio/bss_dgram.c', d)}" + # inject ipv6 specific code if ipv6 is enabled on host + if [ `lsmod | grep -q ipv6; echo $?` -eq 0 ]; then + eval "${@base_contains('DISTRO_FEATURES', 'ipv6', '', 'sed -i -e "/AF_INET6/,/break/d" ${S}/crypto/bio/bss_dgram.c', d)}" + fi } do_compile () {