diff mbox series

[meta-oe] luajit: upgrade 2.1beta -> 2.1

Message ID 20240105190605.885033-1-f_l_k@t-online.de
State Accepted
Headers show
Series [meta-oe] luajit: upgrade 2.1beta -> 2.1 | expand

Commit Message

Markus Volk Jan. 5, 2024, 7:06 p.m. UTC 
drop clang.patch
https://github.com/LuaJIT/LuaJIT/blob/c525bcb9024510cad9e170e12b6209aedb330f83/src/lj_arch.h#L472

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 .../luajit/luajit/clang.patch                 | 19 -------------------
 meta-oe/recipes-devtools/luajit/luajit_git.bb |  5 ++---
 2 files changed, 2 insertions(+), 22 deletions(-)
 delete mode 100644 meta-oe/recipes-devtools/luajit/luajit/clang.patch
diff mbox series

Patch

diff --git a/meta-oe/recipes-devtools/luajit/luajit/clang.patch b/meta-oe/recipes-devtools/luajit/luajit/clang.patch
deleted file mode 100644
index 807cc4417..000000000
--- a/meta-oe/recipes-devtools/luajit/luajit/clang.patch
+++ /dev/null
@@ -1,19 +0,0 @@ 
-clang pretends to be gcc 4.2.0 which is a big lie when it comes
-to features, its same as latest gcc
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Pending
-
-Index: LuaJIT-2.0.5/src/lj_arch.h
-===================================================================
---- LuaJIT-2.0.5.orig/src/lj_arch.h
-+++ LuaJIT-2.0.5/src/lj_arch.h
-@@ -436,7 +436,7 @@
- #endif
- #endif
- #elif !LJ_TARGET_PS3
--#if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 3)
-+#if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 3) && !defined(__clang__)
- #error "Need at least GCC 4.3 or newer"
- #endif
- #endif
diff --git a/meta-oe/recipes-devtools/luajit/luajit_git.bb b/meta-oe/recipes-devtools/luajit/luajit_git.bb
index 06df0690a..72cd04b14 100644
--- a/meta-oe/recipes-devtools/luajit/luajit_git.bb
+++ b/meta-oe/recipes-devtools/luajit/luajit_git.bb
@@ -5,13 +5,12 @@  HOMEPAGE = "http://luajit.org"
 
 SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http;branch=v2.1 \
            file://0001-Do-not-strip-automatically-this-leaves-the-stripping.patch \
-           file://clang.patch \
            file://0001-Use-builtin-for-clear_cache.patch \
            "
 
 # Set PV to a version tag and date (YYMMDD) associated with SRCREV if it is later.
-PV = "2.1.0~beta3-220721"
-SRCREV = "32984282ddae666b3c94cd27538e1c78b49a1877"
+PV = "2.1"
+SRCREV = "c525bcb9024510cad9e170e12b6209aedb330f83"
 
 S = "${WORKDIR}/git"