summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2022-03-16 10:37:41 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-03-17 16:44:33 +0000
commit197c379d2bae0bb279154e050122516116ae385c (patch)
treecc554599d849e935dc666c1c9742e72d72ea1dfd /meta/recipes-core
parent8969f056bec48b95b4a6fb63fa281729efbe0cc7 (diff)
downloadpoky-197c379d2bae0bb279154e050122516116ae385c.tar.gz
libucontext: Upgrade to 1.2 release
License-Update: Copyright years changed [1] aarch64 implements simd register save/restore loongarch64 supported added [1] https://github.com/kaniini/libucontext/commit/9943d4f5fc31a23a591e74caf24ce4effd887501 (From OE-Core rev: d51592e4eb2bc951f0c33a6e69be22aa8ea84d6f) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/musl/libucontext/0001-meson-Add-option-to-pass-cpu.patch49
-rw-r--r--meta/recipes-core/musl/libucontext_1.2.bb (renamed from meta/recipes-core/musl/libucontext_git.bb)6
2 files changed, 2 insertions, 53 deletions
diff --git a/meta/recipes-core/musl/libucontext/0001-meson-Add-option-to-pass-cpu.patch b/meta/recipes-core/musl/libucontext/0001-meson-Add-option-to-pass-cpu.patch
deleted file mode 100644
index 1fdc9f739d..0000000000
--- a/meta/recipes-core/musl/libucontext/0001-meson-Add-option-to-pass-cpu.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1From a530eed9e7e6872e10fe92efaf1e9739471c30ca Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 30 May 2021 08:30:28 -0700
4Subject: [PATCH] meson: Add option to pass cpu
5
6This helps with cross compile setups, where host_cpu != target_cpu
7therefore detecting it on the fly will end up with wrong cpu to build
8for
9
10Upstream-Status: Submitted [https://github.com/kaniini/libucontext/pull/28]
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 meson.build | 6 +++++-
14 meson_options.txt | 4 +++-
15 2 files changed, 8 insertions(+), 2 deletions(-)
16
17diff --git a/meson.build b/meson.build
18index e863780..2b4bdbd 100644
19--- a/meson.build
20+++ b/meson.build
21@@ -6,7 +6,11 @@ project(
22 version : run_command('head', files('VERSION')).stdout()
23 )
24
25-cpu = host_machine.cpu_family()
26+cpu = get_option('cpu')
27+if cpu == ''
28+ cpu = host_machine.cpu_family()
29+endif
30+
31 if cpu == 'sh4'
32 cpu = 'sh'
33 endif
34diff --git a/meson_options.txt b/meson_options.txt
35index d4201d1..864d83c 100644
36--- a/meson_options.txt
37+++ b/meson_options.txt
38@@ -1,4 +1,6 @@
39 option('freestanding', type : 'boolean', value : false,
40 description: 'Do not use system headers')
41 option('export_unprefixed', type : 'boolean', value : true,
42- description: 'Export POSIX 2004 ucontext names as alises')
43\ No newline at end of file
44+ description: 'Export POSIX 2004 ucontext names as alises')
45+option('cpu', type : 'string', value : '',
46+ description: 'Target CPU architecture for cross compile')
47--
482.31.1
49
diff --git a/meta/recipes-core/musl/libucontext_git.bb b/meta/recipes-core/musl/libucontext_1.2.bb
index 9061cf0b1b..4e34df1439 100644
--- a/meta/recipes-core/musl/libucontext_git.bb
+++ b/meta/recipes-core/musl/libucontext_1.2.bb
@@ -4,14 +4,12 @@
4SUMMARY = "ucontext implementation featuring glibc-compatible ABI" 4SUMMARY = "ucontext implementation featuring glibc-compatible ABI"
5HOMEPAGE = "https://github.com/kaniini/libucontext" 5HOMEPAGE = "https://github.com/kaniini/libucontext"
6LICENSE = "ISC" 6LICENSE = "ISC"
7LIC_FILES_CHKSUM = "file://LICENSE;md5=6eed01fa0e673c76f5a5715438f65b1d" 7LIC_FILES_CHKSUM = "file://LICENSE;md5=ebea527af0602d509b7f4c49533fb1bd"
8SECTION = "libs" 8SECTION = "libs"
9DEPENDS = "" 9DEPENDS = ""
10 10
11PV = "1.1+${SRCPV}" 11SRCREV = "4dde3417b4bb4b1b1545bd913be337680b5e28c3"
12SRCREV = "335ee864ef6f4a5d4b525453fd9dbfb3507cfecc"
13SRC_URI = "git://github.com/kaniini/libucontext;branch=master;protocol=https \ 12SRC_URI = "git://github.com/kaniini/libucontext;branch=master;protocol=https \
14 file://0001-meson-Add-option-to-pass-cpu.patch \
15 " 13 "
16 14
17S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"