Skip to contentSkip to conversation

luajit: Update to latest on v2.1 branch

PATCH New Khem Raj 1 participant 4 messages Jan 8, 2023 RISC-V

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/4 luajit: Update to latest on v2.1 branch

---
 meta-oe/recipes-devtools/luajit/luajit_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta-oe/recipes-devtools/luajit/luajit_git.bb +2 -2
index dd1cd51698..06df0690ac 100644
@@ -10,8 +10,8 @@ SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http;branch=v2.1 \
            "
 
 # Set PV to a version tag and date (YYMMDD) associated with SRCREV if it is later.
-PV = "2.1.0~beta3-210112"
-SRCREV = "43ebb949a249a16c49d232ad24dc9127cc4302bb"
+PV = "2.1.0~beta3-220721"
+SRCREV = "32984282ddae666b3c94cd27538e1c78b49a1877"
 
 S = "${WORKDIR}/git"
 
Signature · 1 line
2.39.0
author
#1 lore raw

PATCH 2/4 concurrencykit: Fix build on riscv32

---
 ...0001-build-Use-ilp32d-abi-on-riscv32.patch | 24 +++++++++++++++++++
 .../concurrencykit/concurrencykit_git.bb      |  3 ++-
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-devtools/concurrencykit/concurrencykit/0001-build-Use-ilp32d-abi-on-riscv32.patch
meta-oe/recipes-devtools/concurrencykit/concurrencykit/0001-build-Use-ilp32d-abi-on-riscv32.patch new file +24 -0
new file mode 100644
index 0000000000..a2f79e5464
@@ -0,0 +1,24 @@
+From b709cef30e9e9c7c6c96dc416d141e7283dc4b50 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Sat, 7 Jan 2023 19:31:58 -0800
+Subject: [PATCH] build: Use ilp32d abi on riscv32
+
+ilp32d is common ABI used for linux distributions therefore a better
+default
+
+Upstream-Status: Submitted [https://github.com/concurrencykit/ck/pull/204]
+Signed-off-by: Khem Raj <[email protected]>
+---
+ build/ck.build.riscv | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build/ck.build.riscv b/build/ck.build.riscv
+index 61e0033..11ac840 100644
+--- a/build/ck.build.riscv
++++ b/build/ck.build.riscv
+@@ -1 +1 @@
+-CFLAGS+=-mabi=ilp32
++CFLAGS+=-mabi=ilp32d
+-- 
+2.39.0
+
meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb +2 -1
index fe2c1d201a..ae2bab7e24 100644
@@ -11,7 +11,8 @@ PV = "0.7.0+git${SRCPV}"
 SRCREV = "6e8e5bec2e2f8cef2072a68579cbb07ababf3331"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=a0b24c1a8f9ad516a297d055b0294231"
 SRC_URI = "git://github.com/concurrencykit/ck.git;branch=master;protocol=https \
-           file://0001-configure-Fix-compoiler-detection-logic-for-cross-co.patch"
+           file://0001-configure-Fix-compoiler-detection-logic-for-cross-co.patch \
+           file://0001-build-Use-ilp32d-abi-on-riscv32.patch"
 
 S = "${WORKDIR}/git"
 
Signature · 1 line
2.39.0
author
#2 lore raw

PATCH 3/4 sysbench: Enable only on architectures supporting LuaJIT

In reply to Khem Raj

LuaJIT is a hard dependency for newer sysbench

---
 meta-oe/recipes-benchmark/sysbench/sysbench_1.0.20.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-benchmark/sysbench/sysbench_1.0.20.bb +1 -1
index 098954af37..945e2c3274 100644
@@ -15,7 +15,7 @@ SRCREV = "ebf1c90da05dea94648165e4f149abc20c979557"
 
 S = "${WORKDIR}/git"
 
-COMPATIBLE_HOST = "(arm|aarch64|i.86|x86_64|powerpc|powerpc64|riscv32|riscv64).*-linux*"
+COMPATIBLE_HOST = "(arm|aarch64|i.86|x86_64).*-linux*"
 
 EXTRA_OECONF += "--enable-largefile --with-system-luajit --with-system-ck --without-gcc-arch"
 PACKAGECONFIG ??= ""
Signature · 1 line
2.39.0
author
#3 lore raw

PATCH 4/4 packagegroup-meta-oe: Ensure sysbench is included in limited arches

In reply to Khem Raj

Due to limited arch support in LuaJIT it can not be enabled univesally

---
 .../recipes-core/packagegroups/packagegroup-meta-oe.bb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +6 -4
index 7166b67423..65eaf6a88f 100644
@@ -77,14 +77,16 @@ RDEPENDS:packagegroup-meta-oe-benchmarks = "\
     qperf \
     s-suite \
     stressapptest \
-    sysbench \
     tinymembench \
     tiobench \
     whetstone \
 "
-RDEPENDS:packagegroup-meta-oe-benchmarks:append:armv7a = " cpuburn-arm"
-RDEPENDS:packagegroup-meta-oe-benchmarks:append:armv7ve = " cpuburn-arm"
-RDEPENDS:packagegroup-meta-oe-benchmarks:append:aarch64 = " cpuburn-arm"
+RDEPENDS:packagegroup-meta-oe-benchmarks:append:armv7a = " cpuburn-arm sysbench"
+RDEPENDS:packagegroup-meta-oe-benchmarks:append:armv7ve = " cpuburn-arm sysbench"
+RDEPENDS:packagegroup-meta-oe-benchmarks:append:aarch64 = " cpuburn-arm sysbench"
+RDEPENDS:packagegroup-meta-oe-benchmarks:append:x86 = " sysbench"
+RDEPENDS:packagegroup-meta-oe-benchmarks:append:x86-64 = " sysbench"
+RDEPENDS:packagegroup-meta-oe-benchmarks:append:mips = " sysbench"
 
 RDEPENDS:packagegroup-meta-oe-benchmarks:remove:mipsarch = "libhugetlbfs"
 RDEPENDS:packagegroup-meta-oe-benchmarks:remove:mips64 = "tinymembench"
Signature · 1 line
2.39.0