From 11e808cd7b8470ff63b74126bb13eba69f725f78 Mon Sep 17 00:00:00 2001
From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Mon, 12 May 2008 19:29:18 +0000
Subject: openssl.inc: fix openssl 0.9.8 builds for x86 targets * split
 do_compile() into do do_configure() and do_compile() * don't clobber CFLAG by
 exporting it: edit Configure script to set   the machine-specific flags, and
 let the Configure script append   feature-based flags * don't use
 linux-pentium and linux-ppro, they got dropped in openssl 0.9.8,   use the
 Debian machine definitions instead

---
 packages/openssl/openssl.inc | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'packages/openssl/openssl.inc')

diff --git a/packages/openssl/openssl.inc b/packages/openssl/openssl.inc
index 9fb8b343b6..b77fda9a5b 100644
--- a/packages/openssl/openssl.inc
+++ b/packages/openssl/openssl.inc
@@ -7,11 +7,12 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz"
 S = "${WORKDIR}/openssl-${PV}"
 
 AR_append = " r"
-export CFLAG = "-fPIC -DTHREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -DTERMIO -Wall ${FULL_OPTIMIZATION}"
+CFLAG = "${@base_conditional('SITEINFO_ENDIANESS', 'le', '-DL_ENDIAN', '-DB_ENDIAN', d)} \
+	-DTERMIO ${FULL_OPTIMIZATION} -Wall"
 
 # -02 does not work on mipsel: ssh hangs when it tries to read /dev/urandom
-export CFLAG_mtx-1 := "${@'${CFLAG}'.replace('-O2', '')}"
-export CFLAG_mtx-2 := "${@'${CFLAG}'.replace('-O2', '')}"
+CFLAG_mtx-1 := "${@'${CFLAG}'.replace('-O2', '')}"
+CFLAG_mtx-2 := "${@'${CFLAG}'.replace('-O2', '')}"
 
 export DIRS = "crypto ssl apps"
 export EX_LIBS = "-lgcc -ldl"
@@ -21,15 +22,12 @@ PACKAGES =+ "libcrypto libssl"
 FILES_libcrypto = "${libdir}/libcrypto.so.*"
 FILES_libssl = "${libdir}/libssl.so.*"
 
-do_compile () {
+do_configure () {
 	cd util
 	perl perlpath.pl ${bindir}
 	cd ..
 	ln -sf apps/openssl.pod crypto/crypto.pod ssl/ssl.pod doc/
 
-	# Additional flag based on target endiness (see siteinfo.bbclass)
-	CFLAG="${CFLAG} ${@base_conditional('SITEINFO_ENDIANESS', 'le', '-DL_ENDIAN', '-DB_ENDIAN', d)}"
-
 	os=${HOST_OS}
 	if [ "x$os" = "xlinux-uclibc" ]; then
 		os=linux
@@ -49,13 +47,13 @@ do_compile () {
 		target=debian-sh4
 		;;
 	linux-i486)
-		target=linux-pentium
+		target=debian-i386-i486
 		;;
 	linux-i586)
-		target=linux-pentium
+		target=debian-i386-i586
 		;;
 	linux-i686)
-		target=linux-ppro
+		target=debian-i386-i686/cmov
 		;;
 	linux-powerpc)
 		target=linux-ppc
@@ -67,7 +65,12 @@ do_compile () {
 		target=linux-sparcv8
 		;;
 	esac
+	# inject machine-specific flags
+	sed -i -e "s|^\(\"$target\",\s*\"[^:]\+\):\([^:]\+\)|\1:${CFLAG}|g" Configure
 	perl ./Configure shared --prefix=${prefix} --openssldir=${libdir}/ssl $target
+}
+
+do_compile () {
 	oe_runmake
 }
 
-- 
cgit v1.2.3