[oe-commits] org.oe.dev openssl.inc: fix openssl 0.9.8 builds for x86 targets

[jeremy_laine commit]

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

Author: jeremy_laine at openembedded.org
Branch: org.openembedded.dev
Revision: 51a44a0375ff3c1fddf7f5160707cd3544986312
ViewMTN: http://monotone.openembedded.org/revision/info/51a44a0375ff3c1fddf7f5160707cd3544986312
Files:
1
packages/openssl/openssl-native_0.9.7g.bb
packages/openssl/openssl-native_0.9.7m.bb
packages/openssl/openssl.inc
packages/openssl/openssl_0.9.7e.bb
packages/openssl/openssl_0.9.7g.bb
packages/openssl/openssl_0.9.7m.bb
packages/openssl/openssl_0.9.8g.bb
Diffs:

#
# mt diff -rf6c162744fe67b87fa666acc8d34eb86d0e4d1e0 -r51a44a0375ff3c1fddf7f5160707cd3544986312
#
#
#
# patch "packages/openssl/openssl-native_0.9.7g.bb"
#  from [aee940409bd5054fbf284dbe9b7adbfd5269d114]
#    to [e28e67ce3cebe3a10688393468c808ca63a894ea]
# 
# patch "packages/openssl/openssl-native_0.9.7m.bb"
#  from [aee940409bd5054fbf284dbe9b7adbfd5269d114]
#    to [e28e67ce3cebe3a10688393468c808ca63a894ea]
# 
# patch "packages/openssl/openssl.inc"
#  from [a0a61df4d6fc5943c3fb8c9f885caea1ebd2cb7c]
#    to [936b80ecc8f702aae977abc2f0c764a83f99493a]
# 
# patch "packages/openssl/openssl_0.9.7e.bb"
#  from [b3e48a6eda4535aaf8f41337c7da3ddcb536b0b0]
#    to [cdc364f47e6fc70ee2ed446f5f72222bbb33aa1b]
# 
# patch "packages/openssl/openssl_0.9.7g.bb"
#  from [e1c49f5a11a86d7eb04595e34aeed012e99f1071]
#    to [fd552f9c7200e29d29ff8194df7da0478bdc87e7]
# 
# patch "packages/openssl/openssl_0.9.7m.bb"
#  from [e1c49f5a11a86d7eb04595e34aeed012e99f1071]
#    to [fd552f9c7200e29d29ff8194df7da0478bdc87e7]
# 
# patch "packages/openssl/openssl_0.9.8g.bb"
#  from [e58b856f27d381cd8144f793ed62411811891dbd]
#    to [c4ef5c341f4702a94b6ff131484ec85914e162f4]
#
============================================================
--- packages/openssl/openssl-native_0.9.7g.bb	aee940409bd5054fbf284dbe9b7adbfd5269d114
+++ packages/openssl/openssl-native_0.9.7g.bb	e28e67ce3cebe3a10688393468c808ca63a894ea
@@ -2,7 +2,7 @@ require openssl.inc
 
 require openssl.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI += "file://debian.patch;patch=1 \
             file://armeb.patch;patch=1;pnum=0 \
============================================================
--- packages/openssl/openssl-native_0.9.7m.bb	aee940409bd5054fbf284dbe9b7adbfd5269d114
+++ packages/openssl/openssl-native_0.9.7m.bb	e28e67ce3cebe3a10688393468c808ca63a894ea
@@ -2,7 +2,7 @@ require openssl.inc
 
 require openssl.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI += "file://debian.patch;patch=1 \
             file://armeb.patch;patch=1;pnum=0 \
============================================================
--- packages/openssl/openssl.inc	a0a61df4d6fc5943c3fb8c9f885caea1ebd2cb7c
+++ packages/openssl/openssl.inc	936b80ecc8f702aae977abc2f0c764a83f99493a
@@ -7,11 +7,12 @@ AR_append = " r"
 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 @@ FILES_libssl = "${libdir}/libssl.so.*"
 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
 }
 
============================================================
--- packages/openssl/openssl_0.9.7e.bb	b3e48a6eda4535aaf8f41337c7da3ddcb536b0b0
+++ packages/openssl/openssl_0.9.7e.bb	cdc364f47e6fc70ee2ed446f5f72222bbb33aa1b
@@ -1,6 +1,6 @@ require openssl.inc
 require openssl.inc
 
-PR = "r5"
+PR = "r6"
 
 SRC_URI += "file://debian.patch;patch=1 \
             file://armeb.patch;patch=1 \
============================================================
--- packages/openssl/openssl_0.9.7g.bb	e1c49f5a11a86d7eb04595e34aeed012e99f1071
+++ packages/openssl/openssl_0.9.7g.bb	fd552f9c7200e29d29ff8194df7da0478bdc87e7
@@ -2,7 +2,7 @@ require openssl.inc
 
 require openssl.inc
 
-PR = "r6"
+PR = "r7"
 
 SRC_URI += "file://debian.patch;patch=1 \
             file://armeb.patch;patch=1;pnum=0 \
============================================================
--- packages/openssl/openssl_0.9.7m.bb	e1c49f5a11a86d7eb04595e34aeed012e99f1071
+++ packages/openssl/openssl_0.9.7m.bb	fd552f9c7200e29d29ff8194df7da0478bdc87e7
@@ -2,7 +2,7 @@ require openssl.inc
 
 require openssl.inc
 
-PR = "r6"
+PR = "r7"
 
 SRC_URI += "file://debian.patch;patch=1 \
             file://armeb.patch;patch=1;pnum=0 \
============================================================
--- packages/openssl/openssl_0.9.8g.bb	e58b856f27d381cd8144f793ed62411811891dbd
+++ packages/openssl/openssl_0.9.8g.bb	c4ef5c341f4702a94b6ff131484ec85914e162f4
@@ -2,7 +2,7 @@ require openssl.inc
 
 require openssl.inc
 
-PR = "r7"
+PR = "r8"
 
 SRC_URI += "file://debian.patch;patch=1 \
             file://configure-targets.patch;patch=1 \