diff --git a/meta-oe/recipes-devtools/concurrencykit/concurrencykit/0001-build-Use-ilp32d-abi-on-riscv32-and-lp64d-on-rv64.patch b/meta-oe/recipes-devtools/concurrencykit/concurrencykit/0001-build-Use-ilp32d-abi-on-riscv32-and-lp64d-on-rv64.patch deleted file mode 100644 index a8ff77298f..0000000000 --- a/meta-oe/recipes-devtools/concurrencykit/concurrencykit/0001-build-Use-ilp32d-abi-on-riscv32-and-lp64d-on-rv64.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 00f822ab79b6c06936147af4d832e439cecf0fc0 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 7 Jan 2023 19:31:58 -0800 -Subject: [PATCH] build: Use ilp32d abi on riscv32 and lp64d on rv64 - -ilp32d is common ABI used for linux distributions therefore a better -default, similarily lp64d is common ABI for rv64 linux - -Upstream-Status: Submitted [https://github.com/concurrencykit/ck/pull/204] -Signed-off-by: Khem Raj ---- - build/ck.build.riscv | 2 +- - build/ck.build.riscv64 | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -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 -diff --git a/build/ck.build.riscv64 b/build/ck.build.riscv64 -index 9f89791..7639bd6 100644 ---- a/build/ck.build.riscv64 -+++ b/build/ck.build.riscv64 -@@ -1 +1 @@ --CFLAGS+=-mabi=lp64 -+CFLAGS+=-mabi=lp64d --- -2.39.0 - diff --git a/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb b/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb index dabf9c2c9e..0a498e711e 100644 --- a/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb +++ b/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb @@ -7,12 +7,11 @@ LICENSE = "Apache-2.0 AND BSD-2-Clause" HOMEPAGE = "http://concurrencykit.org" SECTION = "base" -PV = "0.7.0+git" -SRCREV = "6e8e5bec2e2f8cef2072a68579cbb07ababf3331" +PV = "0.7.2" +SRCREV = "981e14290df3d4339974eade5d8820dafd506b58" 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-build-Use-ilp32d-abi-on-riscv32-and-lp64d-on-rv64.patch" + file://0001-configure-Fix-compoiler-detection-logic-for-cross-co.patch" COMPATIBLE_HOST = "(arm|aarch64|i.86|x86_64|powerpc|powerpc64|riscv32|riscv64).*-linux*" @@ -39,3 +38,8 @@ do_compile () { do_install () { oe_runmake 'DESTDIR=${D}' install } + +do_install:append () { + # ck.pc is installed with cp -p, keeping the build user as owner + chown root:root ${D}${libdir}/pkgconfig/ck.pc +}