summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYu Ke <ke.yu@intel.com>2011-07-11 15:23:15 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-12 15:00:47 +0100
commit58ad25bc4309529d8be97de1d60e1a9279cc1d9f (patch)
treecd92d1db2d0c52d72c43aca92ee56d0a6e0c3197
parente90b2315624600b33f0ba4e2af287f58b8786308 (diff)
downloadpoky-58ad25bc4309529d8be97de1d60e1a9279cc1d9f.tar.gz
poky-58ad25bc4309529d8be97de1d60e1a9279cc1d9f.tar.bz2
poky-58ad25bc4309529d8be97de1d60e1a9279cc1d9f.zip
openssl: fix for non /usr/lib libdir case
if libdir is not /usr/lib, e.g /usr/lib64, openssl build will fail because it still use /usr/lib as library dir. this patch appends the configure option "--libdir" to specify the correct library directory (From OE-Core rev: 85ae421002f44f9ad6656af8fca0724a24ba4dc2) Signed-off-by: Yu Ke <ke.yu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/openssl/openssl.inc2
-rw-r--r--meta/recipes-connectivity/openssl/openssl_0.9.8r.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
index a338f0e14a..d42ae1c5d5 100644
--- a/meta/recipes-connectivity/openssl/openssl.inc
+++ b/meta/recipes-connectivity/openssl/openssl.inc
@@ -93,7 +93,7 @@ do_configure () {
if [ "x$useprefix" = "x" ]; then
useprefix=/
fi
- perl ./Configure ${EXTRA_OECONF} shared --prefix=$useprefix --openssldir=${libdir}/ssl $target
+ perl ./Configure ${EXTRA_OECONF} shared --prefix=$useprefix --openssldir=${libdir}/ssl --libdir=`basename ${libdir}` $target
}
do_compile () {
diff --git a/meta/recipes-connectivity/openssl/openssl_0.9.8r.bb b/meta/recipes-connectivity/openssl/openssl_0.9.8r.bb
index 48ec995f27..c95b1f17cd 100644
--- a/meta/recipes-connectivity/openssl/openssl_0.9.8r.bb
+++ b/meta/recipes-connectivity/openssl/openssl_0.9.8r.bb
@@ -1,6 +1,6 @@
require openssl.inc
-PR = "r1"
+PR = "r2"
SRC_URI += "file://debian/ca.patch \
file://debian/config-hurd.patch;apply=no \
file://debian/debian-targets.patch \