diff options
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 @@ -From 9bc3cedba54708c40c4a853b240c46e69f87de3c Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 17 Mar 2020 10:04:40 -0700 -Subject: [PATCH] Makefile: Add LIBDIR variable - -This ensures that it can be installed into custom location and also - -Upstream-Status: Submitted -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - Makefile | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - ---- a/Makefile -+++ b/Makefile -@@ -1,5 +1,5 @@ - ARCH := $(shell uname -m) -- -+LIBDIR := /lib - CFLAGS = -ggdb3 -O2 -Wall -Iarch/${ARCH} - - LIBUCONTEXT_C_SRC = $(wildcard arch/${ARCH}/*.c) -@@ -10,8 +10,8 @@ LIBUCONTEXT_SOVERSION = 0 - LIBUCONTEXT_NAME = libucontext.so - LIBUCONTEXT_STATIC_NAME = libucontext.a - LIBUCONTEXT_SONAME = libucontext.so.${LIBUCONTEXT_SOVERSION} --LIBUCONTEXT_PATH = /lib/${LIBUCONTEXT_SONAME} --LIBUCONTEXT_STATIC_PATH = /lib/${LIBUCONTEXT_STATIC_NAME} -+LIBUCONTEXT_PATH = ${LIBDIR}/${LIBUCONTEXT_SONAME} -+LIBUCONTEXT_STATIC_PATH = ${LIBDIR}/${LIBUCONTEXT_STATIC_NAME} - - all: ${LIBUCONTEXT_SONAME} ${LIBUCONTEXT_STATIC_NAME} - -@@ -36,9 +36,9 @@ clean: - ${LIBUCONTEXT_OBJ} test_libucontext - - install: all -- install -D -m755 ${LIBUCONTEXT_NAME} ${DESTDIR}/${LIBUCONTEXT_PATH} -- install -D -m664 ${LIBUCONTEXT_STATIC_NAME} ${DESTDIR}/${LIBUCONTEXT_STATIC_PATH} -- ln -sf ${LIBUCONTEXT_SONAME} ${DESTDIR}/lib/${LIBUCONTEXT_NAME} -+ install -D -m755 ${LIBUCONTEXT_NAME} ${DESTDIR}${LIBUCONTEXT_PATH} -+ install -D -m664 ${LIBUCONTEXT_STATIC_NAME} ${DESTDIR}${LIBUCONTEXT_STATIC_PATH} -+ ln -sf ${LIBUCONTEXT_SONAME} ${DESTDIR}${LIBDIR}/${LIBUCONTEXT_NAME} - - check: test_libucontext ${LIBUCONTEXT_SONAME} - 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 @@ -From 12d45d250d08e96e889e38e77273c3ef73e6fc97 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 25 Nov 2019 15:07:35 -0800 -Subject: [PATCH] pass LDFLAGS to link step - -This helps to use OE specific linker flags and fixes - -do_package_qa: QA Issue: No GNU_HASH in the ELF binary - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 8a605fd..d1c9637 100644 ---- a/Makefile -+++ b/Makefile -@@ -20,7 +20,7 @@ ${LIBUCONTEXT_STATIC_NAME}: ${LIBUCONTEXT_OBJ} - - ${LIBUCONTEXT_NAME}: ${LIBUCONTEXT_OBJ} - $(CC) -o ${LIBUCONTEXT_NAME} -Wl,-soname,${LIBUCONTEXT_SONAME} \ -- -shared ${LIBUCONTEXT_OBJ} -+ -shared ${LIBUCONTEXT_OBJ} ${LDFLAGS} - - ${LIBUCONTEXT_SONAME}: ${LIBUCONTEXT_NAME} - ln -sf ${LIBUCONTEXT_NAME} ${LIBUCONTEXT_SONAME} --- -2.24.0 - |