summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2023-01-06 19:03:58 -0800
committerKhem Raj <raj.khem@gmail.com>2023-01-08 13:55:12 -0800
commit7a820b585f54913e3937cb6510691ed46285baf9 (patch)
tree9541a807a962e6d899d7cb885530e798597d44d8
parent3b705db82c4f4fb65d5090540091d9d357a7f505 (diff)
downloadmeta-openembedded-7a820b585f54913e3937cb6510691ed46285baf9.tar.gz
concurrencykit: Update to 0.7.0
Enable riscv as it is supported now Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-devtools/concurrencykit/concurrencykit/0001-configure-Fix-compoiler-detection-logic-for-cross-co.patch84
-rw-r--r--meta-oe/recipes-devtools/concurrencykit/concurrencykit/cross.patch62
-rw-r--r--meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb10
3 files changed, 88 insertions, 68 deletions
diff --git a/meta-oe/recipes-devtools/concurrencykit/concurrencykit/0001-configure-Fix-compoiler-detection-logic-for-cross-co.patch b/meta-oe/recipes-devtools/concurrencykit/concurrencykit/0001-configure-Fix-compoiler-detection-logic-for-cross-co.patch
new file mode 100644
index 0000000000..6be0246626
--- /dev/null
+++ b/meta-oe/recipes-devtools/concurrencykit/concurrencykit/0001-configure-Fix-compoiler-detection-logic-for-cross-co.patch
@@ -0,0 +1,84 @@
1From e1dcd27e816520bdabc69511d90c4a2ebc242831 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 6 Jan 2023 18:51:34 -0800
4Subject: [PATCH] configure: Fix compoiler detection logic for
5 cross-compilation
6
7We can not run binaries during cross compile, so poke at compiler to
8figure out if it is clang or gcc, for OE we do not have other compilers
9in opensource world if there are we can extend this logic
10
11Upstream-Status: Inappropriate [OE-Specific]
12
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14---
15 configure | 56 ++++++++++++++++---------------------------------------
16 1 file changed, 16 insertions(+), 40 deletions(-)
17
18--- a/configure
19+++ b/configure
20@@ -661,48 +661,24 @@ if test "$PROFILE"; then
21 fi
22
23 printf "Finding suitable compiler........"
24-if test ! -x "${CC}"; then
25- CC=`pathsearch "${CC:-cc}"`
26- if test -z "$CC" -o ! -x "$CC"; then
27- CC=`pathsearch "${CC:-gcc}"`
28- fi
29+if test -z "$CC"; then
30+ if test ! -x "${CC}"; then
31+ CC=`pathsearch "${CC:-cc}"`
32+ if test -z "$CC" -o ! -x "$CC"; then
33+ CC=`pathsearch "${CC:-gcc}"`
34+ fi
35+ fi
36+ assert "$CC" "not found"
37+fi
38+if `$CC --version | grep gcc >& /dev/null`; then
39+ COMPILER=gcc
40+elif `$CC --version | grep clang >& /dev/null`; then
41+ COMPILER=clang
42+else
43+ COMPILER="not-found"
44 fi
45-assert "$CC" "not found"
46-
47-cat << EOF > .1.c
48-#include <stdio.h>
49-int main(void) {
50-#if defined(_WIN32)
51-#if defined(__MINGW64__)
52- puts("mingw64");
53- return (0);
54-#elif defined(__MINGW32__) && (__MINGW32_MAJOR_VERSION >= 3)
55- puts("mingw32");
56- return (0);
57-#else
58- return (1);
59-#endif /* __MINGW32__ && __MINGW32_MAJOR_VERSION >= 3 */
60-#elif defined(__clang__) && (__clang_major__ >= 3)
61- puts("clang");
62- return (0);
63-#elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x5110)
64- puts("suncc");
65- return (0);
66-#elif defined(__GNUC__) && (__GNUC__ >= 4)
67- puts("gcc");
68- return (0);
69-#else
70- return (1);
71-#endif
72-}
73-EOF
74-
75-$CC -o .1 .1.c
76-COMPILER=`./.1 2> /dev/null`
77-r=$?
78-rm -f .1.c .1
79
80-if test "$r" -ne 0; then
81+if test "$COMPILER" = "not-found"; then
82 assert "" "update compiler"
83 else
84 echo "success [$CC]"
diff --git a/meta-oe/recipes-devtools/concurrencykit/concurrencykit/cross.patch b/meta-oe/recipes-devtools/concurrencykit/concurrencykit/cross.patch
deleted file mode 100644
index 9e5058f2ca..0000000000
--- a/meta-oe/recipes-devtools/concurrencykit/concurrencykit/cross.patch
+++ /dev/null
@@ -1,62 +0,0 @@
1From ab0eec78382bd00ce533aec2c84fd50c1733033d Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 5 Jan 2013 19:42:51 -0800
4
5---
6 configure | 32 ++++++++++++++++++--------------
7 1 file changed, 18 insertions(+), 14 deletions(-)
8
9diff --git a/configure b/configure
10index 76c2812..78ce2ff 100755
11--- a/configure
12+++ b/configure
13@@ -535,14 +535,18 @@ else
14 GZIP_SUFFIX=".gz"
15 fi
16
17-printf "Finding suitable compiler........"
18-CC=`pathsearch "${CC:-cc}"`
19-if test -z "$CC" -o ! -x "$CC"; then
20- CC=`pathsearch "${CC:-gcc}"`
21+if test -z "$CC"; then
22+ printf "Finding suitable compiler........"
23+ CC=`pathsearch "${CC:-cc}"`
24+ if test -z "$CC" -o ! -x "$CC"; then
25+ CC=`pathsearch "${CC:-gcc}"`
26+ fi
27 fi
28 assert "$CC" "not found"
29
30-cat << EOF > .1.c
31+if test -z "$COMPILER"; then
32+
33+ cat << EOF > .1.c
34 #include <stdio.h>
35 int main(void) {
36 #if defined(_WIN32)
37@@ -569,16 +573,16 @@ int main(void) {
38 #endif
39 }
40 EOF
41+ $CC -o .1 .1.c
42+ COMPILER=`./.1`
43+ r=$?
44+ rm -f .1.c .1
45
46-$CC -o .1 .1.c
47-COMPILER=`./.1`
48-r=$?
49-rm -f .1.c .1
50-
51-if test "$r" -ne 0; then
52- assert "" "update compiler"
53-else
54- echo "success [$CC]"
55+ if test "$r" -ne 0; then
56+ assert "" "update compiler"
57+ else
58+ echo "success [$CC]"
59+ fi
60 fi
61
62 if test "$COMPILER" = "suncc"; then
diff --git a/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb b/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb
index 0018064119..cb65250e9a 100644
--- a/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb
+++ b/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb
@@ -7,16 +7,15 @@ LICENSE = "BSD-2-Clause & Apache-2.0"
7HOMEPAGE = "http://concurrencykit.org" 7HOMEPAGE = "http://concurrencykit.org"
8SECTION = "base" 8SECTION = "base"
9 9
10PV = "0.5.1+git${SRCPV}" 10PV = "0.7.0+git${SRCPV}"
11SRCREV = "f97d3da5c375ac2fc5a9173cdd36cb828915a2e1" 11SRCREV = "6e8e5bec2e2f8cef2072a68579cbb07ababf3331"
12LIC_FILES_CHKSUM = "file://LICENSE;md5=a0b24c1a8f9ad516a297d055b0294231" 12LIC_FILES_CHKSUM = "file://LICENSE;md5=a0b24c1a8f9ad516a297d055b0294231"
13SRC_URI = "git://github.com/concurrencykit/ck.git;branch=master;protocol=https \ 13SRC_URI = "git://github.com/concurrencykit/ck.git;branch=master;protocol=https \
14 file://cross.patch \ 14 file://0001-configure-Fix-compoiler-detection-logic-for-cross-co.patch"
15"
16 15
17S = "${WORKDIR}/git" 16S = "${WORKDIR}/git"
18 17
19COMPATIBLE_HOST = "(arm|aarch64|i.86|x86_64|powerpc|powerpc64).*-linux*" 18COMPATIBLE_HOST = "(arm|aarch64|i.86|x86_64|powerpc|powerpc64|riscv32|riscv64).*-linux*"
20 19
21inherit autotools-brokensep 20inherit autotools-brokensep
22 21
@@ -26,7 +25,6 @@ PLAT ?= "${HOST_ARCH}"
26 25
27do_configure () { 26do_configure () {
28 export PLATFORM=${PLAT} 27 export PLATFORM=${PLAT}
29 export COMPILER='gcc'
30 ${S}/configure \ 28 ${S}/configure \
31 --prefix=${prefix} \ 29 --prefix=${prefix} \
32 --includedir=${includedir} \ 30 --includedir=${includedir} \