[oe-commits] [meta-openembedded] 14/19: luajit: test SITEINFO_BITS instead of maintaining a list of 32bit targets

git at git.openembedded.org git at git.openembedded.org
Thu Mar 16 23:41:02 UTC 2017


This is an automated email from the git hooks/post-receive script.

martin_jansa pushed a commit to branch master
in repository meta-openembedded.

commit 56d0a5607a101e0f8e35c0cd7f46bdee8f32f60d
Author: Andre McCurdy <armccurdy at gmail.com>
AuthorDate: Mon Mar 13 12:35:45 2017 -0700

    luajit: test SITEINFO_BITS instead of maintaining a list of 32bit targets
    
    When cross compiling, the word size of the compiler set via HOST_CC
    must match the word size of the target. That's achieved by appending
    "-m32" to BUILD_CC_ARCH if the target word size is known to be 32bits.
    
    Unfortunately the current list of over-rides may not cover all cases.
    Using SITEINFO_BITS is a more generic solution.
    
    Signed-off-by: Andre McCurdy <armccurdy at gmail.com>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb b/meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb
index 2049846..cee9cc4 100644
--- a/meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb
+++ b/meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb
@@ -11,7 +11,7 @@ SRC_URI[sha256sum] = "620fa4eb12375021bef6e4f237cbd2dd5d49e56beb414bee052c746bee
 
 S = "${WORKDIR}/LuaJIT-${PV}"
 
-inherit pkgconfig binconfig
+inherit pkgconfig binconfig siteinfo
 
 BBCLASSEXTEND = "native"
 
@@ -21,11 +21,7 @@ BBCLASSEXTEND = "native"
 # you need to install the multilib development package (e.g.
 # libc6-dev-i386 on Debian/Ubuntu) and build a 32 bit host part
 # (HOST_CC="gcc -m32").
-BUILD_CC_ARCH_append_powerpc = ' -m32'
-BUILD_CC_ARCH_append_x86 = ' -m32'
-BUILD_CC_ARCH_append_arm = ' -m32'
-BUILD_CC_ARCH_append_mips = ' -m32'
-BUILD_CC_ARCH_append_mipsel = ' -m32'
+BUILD_CC_ARCH_append = " ${@['-m32',''][d.getVar('SITEINFO_BITS', True) != '32']}"
 
 # The lua makefiles expect the TARGET_SYS to be from uname -s
 # Values: Windows, Linux, Darwin, iOS, SunOS, PS3, GNU/kFreeBSD

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list