diff options
| author | Yu Ke <ke.yu@intel.com> | 2011-07-11 15:23:15 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-12 14:52:50 +0100 |
| commit | 85ae421002f44f9ad6656af8fca0724a24ba4dc2 (patch) | |
| tree | 846be446a4de662f0fa0c72b47969ad8408ae92a | |
| parent | fe45ef3d77d963136a13687bc14165a30e170d23 (diff) | |
| download | openembedded-core-85ae421002f44f9ad6656af8fca0724a24ba4dc2.tar.gz openembedded-core-85ae421002f44f9ad6656af8fca0724a24ba4dc2.tar.bz2 openembedded-core-85ae421002f44f9ad6656af8fca0724a24ba4dc2.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
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.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-connectivity/openssl/openssl_0.9.8r.bb | 2 |
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 \ |