From 1aeeecba569fea1d4efe22b5fbd245b876e176da Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 14 Apr 2020 10:31:52 -0700 Subject: 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: 5dbb7d5bb9509dd455673a326c9191dec6f3092c) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- meta/recipes-core/musl/libucontext_git.bb | 48 +++++++++++++++---------------- 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'meta/recipes-core/musl/libucontext_git.bb') diff --git a/meta/recipes-core/musl/libucontext_git.bb b/meta/recipes-core/musl/libucontext_git.bb index 92cb703b0b..ec988f1920 100644 --- a/meta/recipes-core/musl/libucontext_git.bb +++ b/meta/recipes-core/musl/libucontext_git.bb @@ -4,26 +4,25 @@ SUMMARY = "ucontext implementation featuring glibc-compatible ABI" HOMEPAGE = "https://github.com/kaniini/libucontext" LICENSE = "ISC" -LIC_FILES_CHKSUM = "file://LICENSE;md5=864cc1445419406b7093e8e531c9515e" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6eed01fa0e673c76f5a5715438f65b1d" SECTION = "libs" DEPENDS = "" -PV = "0.1.3+${SRCPV}" -SRCREV = "e6b4d7516dae9b200e94fcfcb9ebc9331389655f" -SRC_URI = "git://code.foxkit.us/adelie/libucontext.git;protocol=https \ - file://0001-pass-LDFLAGS-to-link-step.patch \ - file://0001-Makefile-Add-LIBDIR-variable.patch \ +PV = "0.10+${SRCPV}" +SRCREV = "19fa1bbfc26efb92147b5e85cc0ca02a0e837561" +SRC_URI = "git://github.com/kaniini/libucontext \ " S = "${WORKDIR}/git" COMPATIBLE_HOST = ".*-musl.*" -valid_archs = "\ -i386 x86 \ -ppc powerpc powerpc64 ppc64 \ -arm aarch64 \ -s390 \ +valid_archs = " \ + x86 x86_64 \ + ppc ppc64 \ + mips mips64 \ + arm aarch64 \ + s390x \ " def map_kernel_arch(a, d): @@ -31,18 +30,19 @@ def map_kernel_arch(a, d): valid_archs = d.getVar('valid_archs').split() - if re.match('(i.86|athlon)$', a): return 'x86' - elif re.match('x86.64$', a): return 'x86_64' - elif re.match('armeb$', a): return 'arm' - elif re.match('aarch64$', a): return 'aarch64' - elif re.match('aarch64_be$', a): return 'aarch64' - elif re.match('aarch64_ilp32$', a): return 'aarch64' - elif re.match('aarch64_be_ilp32$', a): return 'aarch64' - elif re.match('mips(isa|)(32|64|)(r6|)(el|)$', a): return 'mips' - elif re.match('p(pc|owerpc)', a): return 'ppc' - elif re.match('p(pc64|owerpc64)', a): return 'ppc64' - elif re.match('riscv64$', a): return 'riscv64' - elif a in valid_archs: return a + if a in valid_archs: return a + elif re.match('(i.86|athlon)$', a): return 'x86' + elif re.match('x86.64$', a): return 'x86_64' + elif re.match('armeb$', a): return 'arm' + elif re.match('aarch64$', a): return 'aarch64' + elif re.match('aarch64_be$', a): return 'aarch64' + elif re.match('aarch64_ilp32$', a): return 'aarch64' + elif re.match('aarch64_be_ilp32$', a): return 'aarch64' + elif re.match('mips(isa|)(32|)(r6|)(el|)$', a): return 'mips' + elif re.match('mips(isa|)64(r6|)(el|)$', a): return 'mips64' + elif re.match('p(pc|owerpc)', a): return 'ppc' + elif re.match('p(pc64|owerpc64)', a): return 'ppc64' + elif re.match('riscv64$', a): return 'riscv64' else: if not d.getVar("TARGET_OS").startswith("linux"): return a @@ -50,7 +50,7 @@ def map_kernel_arch(a, d): export ARCH = "${@map_kernel_arch(d.getVar('TARGET_ARCH'), d)}" -CFLAGS += "-Iarch/${ARCH}" +CFLAGS += "-Iarch/${ARCH} -Iarch/common" EXTRA_OEMAKE = "CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}' LIBDIR='${base_libdir}'" -- cgit v1.2.3-54-g00ecf