libucontext: Bring in mips/mips64 support
PATCH v3 1/2 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
fix build with clang
[1] https://github.com/kaniini/libucontext/commit/d31eaabbaf5f45656c10e4bccd3fe6653a7d3ec1
---
v2: Delete removed patches, update license checksum
v3: Fix build with clang
...move-using-.end-directive-with-clang.patch | 36 ++++++++++++++ .../0001-Makefile-Add-LIBDIR-variable.patch | 46 ----------------- ...move-using-.end-directive-with-clang.patch | 36 ++++++++++++++ .../0001-pass-LDFLAGS-to-link-step.patch | 31 ------------ meta/recipes-core/musl/libucontext_git.bb | 49 ++++++++++--------- 5 files changed, 97 insertions(+), 101 deletions(-) create mode 100644 meta/recipes-core/musl/0001-Remove-using-.end-directive-with-clang.patch delete mode 100644 meta/recipes-core/musl/libucontext/0001-Makefile-Add-LIBDIR-variable.patch create mode 100644 meta/recipes-core/musl/libucontext/0001-Remove-using-.end-directive-with-clang.patch delete mode 100644 meta/recipes-core/musl/libucontext/0001-pass-LDFLAGS-to-link-step.patch
meta/recipes-core/musl/0001-Remove-using-.end-directive-with-clang.patch new file +36 -0
@@ -0,0 +1,36 @@ +From b6732f68848ecc8ff01054bf7aea70a241c37116 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Fri, 10 Apr 2020 11:23:39 -0700 +Subject: [PATCH] Remove using .end directive with clang + +Clang does not support this asm directive +Fixes Issue #19 + +Upstream-Status: Submitted [https://github.com/kaniini/libucontext/pull/20] +Signed-off-by: Khem Raj <[email protected]> +--- + arch/common/common-defs.h | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/arch/common/common-defs.h b/arch/common/common-defs.h +index bf2fb8c..618116b 100644 +--- a/arch/common/common-defs.h ++++ b/arch/common/common-defs.h +@@ -28,10 +28,13 @@ + ENT(__proc) \ + __proc: \ + SETUP_FRAME(__proc) +- ++#ifdef __clang__ ++#define END(__proc) ++#else + #define END(__proc) \ + .end __proc; \ + .size __proc,.-__proc; ++#endif + + #define ALIAS(__alias, __real) \ + .weak __alias; \ +-- +2.26.0 +
meta/recipes-core/musl/libucontext/0001-Makefile-Add-LIBDIR-variable.patch deleted +0 -46
46 lines not on this page · raw message
meta/recipes-core/musl/libucontext/0001-Remove-using-.end-directive-with-clang.patch new file +36 -0
@@ -0,0 +1,36 @@ +From b6732f68848ecc8ff01054bf7aea70a241c37116 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Fri, 10 Apr 2020 11:23:39 -0700 +Subject: [PATCH] Remove using .end directive with clang + +Clang does not support this asm directive +Fixes Issue #19 + +Upstream-Status: Submitted [https://github.com/kaniini/libucontext/pull/20] +Signed-off-by: Khem Raj <[email protected]> +--- + arch/common/common-defs.h | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/arch/common/common-defs.h b/arch/common/common-defs.h +index bf2fb8c..618116b 100644 +--- a/arch/common/common-defs.h ++++ b/arch/common/common-defs.h +@@ -28,10 +28,13 @@ + ENT(__proc) \ + __proc: \ + SETUP_FRAME(__proc) +- ++#ifdef __clang__ ++#define END(__proc) ++#else + #define END(__proc) \ + .end __proc; \ + .size __proc,.-__proc; ++#endif + + #define ALIAS(__alias, __real) \ + .weak __alias; \ +-- +2.26.0 +
meta/recipes-core/musl/libucontext/0001-pass-LDFLAGS-to-link-step.patch deleted +0 -31
@@ -1,31 +0,0 @@ -From 12d45d250d08e96e889e38e77273c3ef73e6fc97 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -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 <[email protected]> ---- - 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 -
meta/recipes-core/musl/libucontext_git.bb +25 -24
76 lines not on this page · raw message
Signature · 1 line
2.26.0
PATCH v3 2/2 ruby: Link with libucontext on musl
coroutines in ruby 2.7+ needs ucontext APIs which are not available in musl but an external library is available to provide them so use it
Use cached values for ac_cv_func_isnan and ac_cv_func_isinf this is not detected correctly by configure on musl
on ARM drop using old arm32 implementation of coroutine which is slow and inefficient
---
v2: No change
v3: No change
meta/recipes-devtools/ruby/ruby_2.7.0.bb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
meta/recipes-devtools/ruby/ruby_2.7.0.bb +7 -2
@@ -1,5 +1,7 @@ require ruby.inc +DEPENDS_append_libc-musl = " libucontext" + SRC_URI += " \ file://remove_has_include_macros.patch \ file://run-ptest \
@@ -25,8 +27,11 @@ EXTRA_OECONF = "\ --with-pkg-config=pkg-config \ " -EXTRA_OECONF_append_libc-musl_arm = " --with-coroutine=arm32" -EXTRA_OECONF_append_libc-musl_armeb = " --with-coroutine=arm32" +EXTRA_OECONF_append_libc-musl = "\ + LIBS='-lucontext' \ + ac_cv_func_isnan=yes \ + ac_cv_func_isinf=yes \ +" do_install() { oe_runmake 'DESTDIR=${D}' install
Signature · 1 line
2.26.0