Skip to contentSkip to conversation

luajit: Fix override syntax

PATCH In review Khem Raj 2 participants 2 messages Aug 3, 2021

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 luajit: Fix override syntax

Do not convert the variable name resembling override setups passed to makefile Fix some of missed overrides

Cc Martin Jansa <[email protected]>
---
 meta-oe/recipes-devtools/luajit/luajit_git.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
meta-oe/recipes-devtools/luajit/luajit_git.bb +3 -3
index 645680cd9f..d4ff06b677 100644
@@ -30,8 +30,8 @@ BUILD_CC_ARCH:append = " ${@['-m32',''][d.getVar('SITEINFO_BITS') != '32']}"
 # Values: Windows, Linux, Darwin, iOS, SunOS, PS3, GNU/kFreeBSD
 LUA_TARGET_OS = "Unknown"
 LUA_TARGET_OS:darwin = "Darwin"
-LUA_TARGET_OS_linux = "Linux"
-LUA_TARGET_OS_linux-gnueabi = "Linux"
+LUA_TARGET_OS:linux = "Linux"
+LUA_TARGET_OS:linux-gnueabi = "Linux"
 LUA_TARGET_OS:mingw32 = "Windows"
 
 # We don't want the lua buildsystem's compiler optimizations, or its
@@ -40,7 +40,7 @@ LUA_TARGET_OS:mingw32 = "Windows"
 EXTRA_OEMAKE = "\
     Q= E='@:' \
     \
-    CCOPT= CCOPT:x86= CFLAGS= LDFLAGS= TARGET_STRIP='@:' \
+    CCOPT= CCOPT_x86= CFLAGS= LDFLAGS= TARGET_STRIP='@:' \
     \
     'TARGET_SYS=${LUA_TARGET_OS}' \
     \

--
2.32.0

#1 lore raw

LGTM, thanks!

Quoted 39 lines · Khem Raj

Do not convert the variable name resembling override setups passed to makefile
Fix some of missed overrides

Cc Martin Jansa <[email protected]>
---
 meta-oe/recipes-devtools/luajit/luajit_git.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
meta-oe/recipes-devtools/luajit/luajit_git.bb +0 -0
index 645680cd9f..d4ff06b677 100644
@@ -30,8 +30,8 @@ BUILD_CC_ARCH:append = "

${@['-m32',''][d.getVar('SITEINFO_BITS') != '32']}"
# Values: Windows, Linux, Darwin, iOS, SunOS, PS3, GNU/kFreeBSD LUA_TARGET_OS = "Unknown"
LUA_TARGET_OS:darwin = "Darwin"

meta-oe/recipes-devtools/luajit/luajit_git.bb +3 -4
-LUA_TARGET_OS_linux = "Linux"
-LUA_TARGET_OS_linux-gnueabi = "Linux"
+LUA_TARGET_OS:linux = "Linux"
+LUA_TARGET_OS:linux-gnueabi = "Linux"
 LUA_TARGET_OS:mingw32 = "Windows"
 
 # We don't want the lua buildsystem's compiler optimizations, or its
@@ -40,7 +40,7 @@ LUA_TARGET_OS:mingw32 = "Windows"
 EXTRA_OEMAKE = "\
     Q= E='@:' \
     \
-    CCOPT= CCOPT:x86= CFLAGS= LDFLAGS= TARGET_STRIP='@:' \
+    CCOPT= CCOPT_x86= CFLAGS= LDFLAGS= TARGET_STRIP='@:' \
     \
     'TARGET_SYS=${LUA_TARGET_OS}' \
     \
--

2.32.0