]> code.ossystems Code Review - openembedded-core.git/commitdiff
nss: Fix build in x32 ABI
authorAníbal Limón <anibal.limon@linux.intel.com>
Wed, 8 Apr 2015 10:04:45 +0000 (10:04 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 9 Apr 2015 18:48:00 +0000 (19:48 +0100)
When try to build nss with x32 ABI enabled fails because
it need to be specified USE_X32 env var.

[YOCTO #7420]

Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-support/nss/nss.inc

index 4082930acee20041edc592b93814a1762c8a20a5..665e4e6a09fab71d0510d23c6a8737e6f5d022db 100644 (file)
@@ -72,6 +72,8 @@ do_compile() {
 
     if [ "${SITEINFO_BITS}" = "64" ]; then
         export USE_64=1
+    elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then
+        export USE_X32=1
     fi
 
     # We can modify CC in the environment, but if we set it via an
@@ -115,6 +117,8 @@ do_install() {
     fi
     if [ "${SITEINFO_BITS}" = "64" ]; then
         export USE_64=1
+    elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then
+        export USE_X32=1
     fi
 
     make -C ./nss \