summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJamie Lenehan <lenehan@twibble.org>2006-11-16 03:25:10 +0000
committerJamie Lenehan <lenehan@twibble.org>2006-11-16 03:25:10 +0000
commit6f96455df32a8577c7ad731b6bc783833390bd11 (patch)
treec41ee04cf10b5076d64cc1dc2a5a871ef7f856d6
parent2d49a466e65abe021cd14ec349a5c10a9fba2b69 (diff)
openssl: Use the new siteinfo stuff to determine the endianess and set the
appropriate flag rather then manually processing the site file contents to do this.
-rw-r--r--packages/openssl/openssl.inc11
-rw-r--r--packages/openssl/openssl_0.9.7e.bb2
-rw-r--r--packages/openssl/openssl_0.9.7g.bb2
3 files changed, 4 insertions, 11 deletions
diff --git a/packages/openssl/openssl.inc b/packages/openssl/openssl.inc
index dc734d93a8..e7e3b37e3c 100644
--- a/packages/openssl/openssl.inc
+++ b/packages/openssl/openssl.inc
@@ -27,15 +27,8 @@ do_compile () {
cd ..
ln -sf apps/openssl.pod crypto/crypto.pod ssl/ssl.pod doc/
- # endianness fun.. whee
- . ${CONFIG_SITE}
- if [ "x$ac_cv_c_bigendian" = "xyes" -o "x$ac_cv_c_littleendian" = "xno" ]; then
- CFLAG="${CFLAG} -DB_ENDIAN"
- elif [ "x$ac_cv_c_littleendian" = "xyes" -o "x$ac_cv_c_bigendian" = "xno" ]; then
- CFLAG="${CFLAG} -DL_ENDIAN"
- else
- oefatal do_configure cannot determine endianess
- fi
+ # 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
diff --git a/packages/openssl/openssl_0.9.7e.bb b/packages/openssl/openssl_0.9.7e.bb
index 90d31c6a12..d9b8d91cdc 100644
--- a/packages/openssl/openssl_0.9.7e.bb
+++ b/packages/openssl/openssl_0.9.7e.bb
@@ -1,6 +1,6 @@
require openssl.inc
-PR = "r3"
+PR = "r4"
SRC_URI += "file://debian.patch;patch=1 \
file://armeb.patch;patch=1 \
diff --git a/packages/openssl/openssl_0.9.7g.bb b/packages/openssl/openssl_0.9.7g.bb
index 45fcabea04..4af1fbfd48 100644
--- a/packages/openssl/openssl_0.9.7g.bb
+++ b/packages/openssl/openssl_0.9.7g.bb
@@ -2,7 +2,7 @@ inherit pkgconfig
require openssl.inc
-PR = "r1"
+PR = "r2"
SRC_URI += "file://debian.patch;patch=1 \
file://armeb.patch;patch=1;pnum=0 \