[oe] [PATCH 11/14] openssl_1.0.0e: fix build issue for hosts without ipv6

Apelete Seketeli apelete at seketeli.net
Thu Jul 5 17:39:29 UTC 2012


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 <apelete at seketeli.net>
---
 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 24b517d..06dcdae 100644
--- a/recipes/openssl/openssl.inc
+++ b/recipes/openssl/openssl.inc
@@ -100,7 +100,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 () {
-- 
1.7.10





More information about the Openembedded-devel mailing list