summaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorLeo Yan <leo.yan@linaro.org>2020-02-26 12:26:22 +0000
committerKhem Raj <raj.khem@gmail.com>2020-02-27 17:05:43 -0800
commit14eb47687eb9f4bd9847eb9e6527fe75bd8e77a4 (patch)
tree427d7eb569bda868308430855b525d6555214346 /meta-oe
parentb09d0bd4d7571bb72d512c1d4d583a414bd02248 (diff)
downloadmeta-openembedded-14eb47687eb9f4bd9847eb9e6527fe75bd8e77a4.tar.gz
luajit: Upgrade to 2.1.0-beta3
Since luajit 2.1.0-beta3 can support architecture aarch64 and the old misses to support aarch64, the patch upgrades to luajit 2.1.0-beta3. Also updated clang.patch to dismiss patch warning: "Hunk #1 succeeded at 436 with fuzz 1 (offset 123 lines)." Signed-off-by: Leo Yan <leo.yan@linaro.org> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-devtools/luajit/luajit/clang.patch4
-rw-r--r--meta-oe/recipes-devtools/luajit/luajit_git.bb (renamed from meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb)13
2 files changed, 8 insertions, 9 deletions
diff --git a/meta-oe/recipes-devtools/luajit/luajit/clang.patch b/meta-oe/recipes-devtools/luajit/luajit/clang.patch
index c39ef6fd4..807cc4417 100644
--- a/meta-oe/recipes-devtools/luajit/luajit/clang.patch
+++ b/meta-oe/recipes-devtools/luajit/luajit/clang.patch
@@ -8,8 +8,8 @@ Index: LuaJIT-2.0.5/src/lj_arch.h
8=================================================================== 8===================================================================
9--- LuaJIT-2.0.5.orig/src/lj_arch.h 9--- LuaJIT-2.0.5.orig/src/lj_arch.h
10+++ LuaJIT-2.0.5/src/lj_arch.h 10+++ LuaJIT-2.0.5/src/lj_arch.h
11@@ -313,7 +313,7 @@ 11@@ -436,7 +436,7 @@
12 #error "Need at least GCC 4.2 or newer" 12 #endif
13 #endif 13 #endif
14 #elif !LJ_TARGET_PS3 14 #elif !LJ_TARGET_PS3
15-#if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 3) 15-#if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 3)
diff --git a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb b/meta-oe/recipes-devtools/luajit/luajit_git.bb
index 93128dda8..c4f821648 100644
--- a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb
+++ b/meta-oe/recipes-devtools/luajit/luajit_git.bb
@@ -1,14 +1,14 @@
1SUMMARY = "Just-In-Time Compiler for Lua" 1SUMMARY = "Just-In-Time Compiler for Lua"
2LICENSE = "MIT" 2LICENSE = "MIT"
3LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=10a96c93403affcc34765f4c2612bc22" 3LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=d739bb9250a55c124a545b588fd76771"
4HOMEPAGE = "http://luajit.org" 4HOMEPAGE = "http://luajit.org"
5 5
6PV .= "+git${SRCPV}" 6PV = "2.1.0~beta3"
7SRCREV = "02b521981a1ab919ff2cd4d9bcaee80baf77dce2" 7SRCREV = "0ad60ccbc3768fa8e3e726858adf261950edbc22"
8SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http \ 8SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http;branch=v2.1 \
9 file://0001-Do-not-strip-automatically-this-leaves-the-stripping.patch \ 9 file://0001-Do-not-strip-automatically-this-leaves-the-stripping.patch \
10 file://clang.patch \ 10 file://clang.patch \
11" 11 "
12 12
13S = "${WORKDIR}/git" 13S = "${WORKDIR}/git"
14 14
@@ -90,8 +90,7 @@ FILES_${PN}-dev += "${libdir}/libluajit-5.1.a \
90" 90"
91FILES_luajit-common = "${datadir}/${BPN}-${PV}" 91FILES_luajit-common = "${datadir}/${BPN}-${PV}"
92 92
93# Aarch64/mips64/ppc/ppc64/riscv64 is not supported in this release 93# mips64/ppc/ppc64/riscv64 is not supported in this release
94COMPATIBLE_HOST_aarch64 = "null"
95COMPATIBLE_HOST_mipsarchn32 = "null" 94COMPATIBLE_HOST_mipsarchn32 = "null"
96COMPATIBLE_HOST_mipsarchn64 = "null" 95COMPATIBLE_HOST_mipsarchn64 = "null"
97COMPATIBLE_HOST_powerpc = "null" 96COMPATIBLE_HOST_powerpc = "null"