diff options
| author | Khem Raj <raj.khem@gmail.com> | 2020-04-14 10:31:52 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-04-24 14:10:07 +0100 |
| commit | 67622318092b2716603738b0b509b24ec457deaf (patch) | |
| tree | 212661003b0cbc4944bd221dbe5e337e42a8309e /meta/recipes-core/musl/libucontext | |
| parent | 76b27d57a98d064491e80551671b64c2dd303ed9 (diff) | |
| download | poky-67622318092b2716603738b0b509b24ec457deaf.tar.gz | |
libucontext: Bring in mips/mips64 support
License-Update: Updated copyright years [1]
Latest master 0.10.x+ has added support for mips/mips64, which should
help compile ruby on musl for these architectures
Switch SRC_URI to github upstream URI
Check for common arches before checking others in map_kernel_arch
Drop already upstreamed patches
[1] https://github.com/kaniini/libucontext/commit/d31eaabbaf5f45656c10e4bccd3fe6653a7d3ec1
(From OE-Core rev: aa3b25b649cfe5d30cc0d8a539fbbcc9efdb4fbd)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/musl/libucontext')
| -rw-r--r-- | meta/recipes-core/musl/libucontext/0001-Makefile-Add-LIBDIR-variable.patch | 46 | ||||
| -rw-r--r-- | meta/recipes-core/musl/libucontext/0001-pass-LDFLAGS-to-link-step.patch | 31 |
2 files changed, 0 insertions, 77 deletions
diff --git a/meta/recipes-core/musl/libucontext/0001-Makefile-Add-LIBDIR-variable.patch b/meta/recipes-core/musl/libucontext/0001-Makefile-Add-LIBDIR-variable.patch deleted file mode 100644 index 4f91c8f189..0000000000 --- a/meta/recipes-core/musl/libucontext/0001-Makefile-Add-LIBDIR-variable.patch +++ /dev/null | |||
| @@ -1,46 +0,0 @@ | |||
| 1 | From 9bc3cedba54708c40c4a853b240c46e69f87de3c Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Tue, 17 Mar 2020 10:04:40 -0700 | ||
| 4 | Subject: [PATCH] Makefile: Add LIBDIR variable | ||
| 5 | |||
| 6 | This ensures that it can be installed into custom location and also | ||
| 7 | |||
| 8 | Upstream-Status: Submitted | ||
| 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 10 | --- | ||
| 11 | Makefile | 6 +++--- | ||
| 12 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
| 13 | |||
| 14 | --- a/Makefile | ||
| 15 | +++ b/Makefile | ||
| 16 | @@ -1,5 +1,5 @@ | ||
| 17 | ARCH := $(shell uname -m) | ||
| 18 | - | ||
| 19 | +LIBDIR := /lib | ||
| 20 | CFLAGS = -ggdb3 -O2 -Wall -Iarch/${ARCH} | ||
| 21 | |||
| 22 | LIBUCONTEXT_C_SRC = $(wildcard arch/${ARCH}/*.c) | ||
| 23 | @@ -10,8 +10,8 @@ LIBUCONTEXT_SOVERSION = 0 | ||
| 24 | LIBUCONTEXT_NAME = libucontext.so | ||
| 25 | LIBUCONTEXT_STATIC_NAME = libucontext.a | ||
| 26 | LIBUCONTEXT_SONAME = libucontext.so.${LIBUCONTEXT_SOVERSION} | ||
| 27 | -LIBUCONTEXT_PATH = /lib/${LIBUCONTEXT_SONAME} | ||
| 28 | -LIBUCONTEXT_STATIC_PATH = /lib/${LIBUCONTEXT_STATIC_NAME} | ||
| 29 | +LIBUCONTEXT_PATH = ${LIBDIR}/${LIBUCONTEXT_SONAME} | ||
| 30 | +LIBUCONTEXT_STATIC_PATH = ${LIBDIR}/${LIBUCONTEXT_STATIC_NAME} | ||
| 31 | |||
| 32 | all: ${LIBUCONTEXT_SONAME} ${LIBUCONTEXT_STATIC_NAME} | ||
| 33 | |||
| 34 | @@ -36,9 +36,9 @@ clean: | ||
| 35 | ${LIBUCONTEXT_OBJ} test_libucontext | ||
| 36 | |||
| 37 | install: all | ||
| 38 | - install -D -m755 ${LIBUCONTEXT_NAME} ${DESTDIR}/${LIBUCONTEXT_PATH} | ||
| 39 | - install -D -m664 ${LIBUCONTEXT_STATIC_NAME} ${DESTDIR}/${LIBUCONTEXT_STATIC_PATH} | ||
| 40 | - ln -sf ${LIBUCONTEXT_SONAME} ${DESTDIR}/lib/${LIBUCONTEXT_NAME} | ||
| 41 | + install -D -m755 ${LIBUCONTEXT_NAME} ${DESTDIR}${LIBUCONTEXT_PATH} | ||
| 42 | + install -D -m664 ${LIBUCONTEXT_STATIC_NAME} ${DESTDIR}${LIBUCONTEXT_STATIC_PATH} | ||
| 43 | + ln -sf ${LIBUCONTEXT_SONAME} ${DESTDIR}${LIBDIR}/${LIBUCONTEXT_NAME} | ||
| 44 | |||
| 45 | check: test_libucontext ${LIBUCONTEXT_SONAME} | ||
| 46 | env LD_LIBRARY_PATH=$(shell pwd) ./test_libucontext | ||
diff --git a/meta/recipes-core/musl/libucontext/0001-pass-LDFLAGS-to-link-step.patch b/meta/recipes-core/musl/libucontext/0001-pass-LDFLAGS-to-link-step.patch deleted file mode 100644 index 0ab8caf3e6..0000000000 --- a/meta/recipes-core/musl/libucontext/0001-pass-LDFLAGS-to-link-step.patch +++ /dev/null | |||
| @@ -1,31 +0,0 @@ | |||
| 1 | From 12d45d250d08e96e889e38e77273c3ef73e6fc97 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Mon, 25 Nov 2019 15:07:35 -0800 | ||
| 4 | Subject: [PATCH] pass LDFLAGS to link step | ||
| 5 | |||
| 6 | This helps to use OE specific linker flags and fixes | ||
| 7 | |||
| 8 | do_package_qa: QA Issue: No GNU_HASH in the ELF binary | ||
| 9 | |||
| 10 | Upstream-Status: Pending | ||
| 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 12 | --- | ||
| 13 | Makefile | 2 +- | ||
| 14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 15 | |||
| 16 | diff --git a/Makefile b/Makefile | ||
| 17 | index 8a605fd..d1c9637 100644 | ||
| 18 | --- a/Makefile | ||
| 19 | +++ b/Makefile | ||
| 20 | @@ -20,7 +20,7 @@ ${LIBUCONTEXT_STATIC_NAME}: ${LIBUCONTEXT_OBJ} | ||
| 21 | |||
| 22 | ${LIBUCONTEXT_NAME}: ${LIBUCONTEXT_OBJ} | ||
| 23 | $(CC) -o ${LIBUCONTEXT_NAME} -Wl,-soname,${LIBUCONTEXT_SONAME} \ | ||
| 24 | - -shared ${LIBUCONTEXT_OBJ} | ||
| 25 | + -shared ${LIBUCONTEXT_OBJ} ${LDFLAGS} | ||
| 26 | |||
| 27 | ${LIBUCONTEXT_SONAME}: ${LIBUCONTEXT_NAME} | ||
| 28 | ln -sf ${LIBUCONTEXT_NAME} ${LIBUCONTEXT_SONAME} | ||
| 29 | -- | ||
| 30 | 2.24.0 | ||
| 31 | |||
