Patchwork openssl: enforce libdir=lib

login
register
mail settings
Submitter Enrico Scholz
Date April 26, 2011, 10:29 a.m.
Message ID <1303813776-6345-1-git-send-email-enrico.scholz@sigma-chemnitz.de>
Download mbox | patch
Permalink /patch/2875/
State New, archived
Headers show

Comments

Enrico Scholz - April 26, 2011, 10:29 a.m.
From: Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>

openssl tries to detect multlib environments and assigns libdir=lib64
e.g. for x86_64 targets.  This breaks OE assumptions about the location
of pkgconfig files and causes build failures.

As OE is not multilib aware, use always a static "lib" value for libdir.

Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
---
 recipes/openssl/openssl.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Michael Smith - April 26, 2011, 11:51 a.m.
On Tue, 26 Apr 2011, Enrico Scholz wrote:

> diff --git a/recipes/openssl/openssl.inc b/recipes/openssl/openssl.inc
> index 24b517d..a2eaaa3 100644
> --- a/recipes/openssl/openssl.inc
> +++ b/recipes/openssl/openssl.inc
> @@ -97,7 +97,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 --libdir=lib --openssldir=${libdir}/ssl $target

Could you change "lib" to "${libdir}"? For x86_64 builds my libdir is 
/usr/lib64.

Mike
Enrico Scholz - April 26, 2011, 12:15 p.m.
Michael Smith <msmith@cbnco.com> writes:

>> -	perl ./Configure ${EXTRA_OECONF} shared --prefix=$useprefix --openssldir=${libdir}/ssl $target
>> +	perl ./Configure ${EXTRA_OECONF} shared --prefix=$useprefix --libdir=lib --openssldir=${libdir}/ssl $target
>
> Could you change "lib" to "${libdir}"? For x86_64 builds my libdir is 
> /usr/lib64.

ok; I will use `basename ${libdir}`.

Just for interest: how did you configured the x86_64 target to use
lib64 directories?  By manually overriding all the *libdir variables in
bitbake.conf?  How well are recipes prepared to use ${*libdir} instead
of static /lib?


Enrico

Patch

diff --git a/recipes/openssl/openssl.inc b/recipes/openssl/openssl.inc
index 24b517d..a2eaaa3 100644
--- a/recipes/openssl/openssl.inc
+++ b/recipes/openssl/openssl.inc
@@ -97,7 +97,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 --libdir=lib --openssldir=${libdir}/ssl $target
 
 	eval "${@base_contains('DISTRO_FEATURES', 'largefile', '', 'sed -i -e "/_FILE_OFFSET_BITS/,/#endif/d" ${S}/crypto/bio/bss_file.c', d)}"
 	eval "${@base_contains('DISTRO_FEATURES', 'ipv6', '', 'sed -i -e "/AF_INET6/,/break/d" ${S}/crypto/bio/bss_dgram.c', d)}"