[oe-commits] Apelete Seketeli : openssl_1.0.0e: fix build issue for hosts without ipv6
git at git.openembedded.org
git at git.openembedded.org
Tue Jul 10 09:30:44 UTC 2012
Module: openembedded.git
Branch: 2011.03-maintenance
Commit: e298239228abffc1bf19aec489ac05b05ad56f36
URL: http://git.openembedded.org/?p=openembedded.git&a=commit;h=e298239228abffc1bf19aec489ac05b05ad56f36
Author: Apelete Seketeli <apelete at seketeli.net>
Date: Tue Jun 26 23:50:47 2012 +0200
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 at seketeli.net>
---
recipes/openssl/openssl.inc | 5 ++++-
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 () {
More information about the Openembedded-commits
mailing list