aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorApelete Seketeli <apelete@seketeli.net>2012-06-26 23:50:47 +0200
committerApelete Seketeli <apelete@seketeli.net>2012-07-04 22:20:48 +0200
commite298239228abffc1bf19aec489ac05b05ad56f36 (patch)
tree7098a5416131541aaf6c73c19d404d4f002ed020
parentc7e85ba9134dc14237db102aa6d69668d5fe74a0 (diff)
downloadopenembedded-e298239228abffc1bf19aec489ac05b05ad56f36.zip
openembedded-e298239228abffc1bf19aec489ac05b05ad56f36.tar.gz
openembedded-e298239228abffc1bf19aec489ac05b05ad56f36.tar.bz2
openssl_1.0.0e: fix build issue for hosts without ipv6
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@seketeli.net>
-rw-r--r--recipes/openssl/openssl.inc5
1 files changed, 4 insertions, 1 deletions
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 () {