summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2022-03-12 23:59:30 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-03-15 08:40:09 +0000
commit27e7af17f8d77a69cbd6373c5bb0b902194056ef (patch)
treef84ad7682957bd0002c0d28e981a45cb4185a5aa /meta/recipes-core
parent55e7265f47270b56429e65f076ecfbe24f2db7c2 (diff)
downloadpoky-27e7af17f8d77a69cbd6373c5bb0b902194056ef.tar.gz
gcompat: Do not use static-pie on ppc
It fails currently with binutils 2.38 powerpc-yoe-linux-musl-ld: read-only segment has dynamic relocations (From OE-Core rev: 6a8c1e04e2bf37fa4128b1742ef4184380e3321d) 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/gcompat/0001-make-Static-PIE-does-not-work-on-musl-ppc.patch30
-rw-r--r--meta/recipes-core/musl/gcompat_git.bb7
2 files changed, 35 insertions, 2 deletions
diff --git a/meta/recipes-core/musl/gcompat/0001-make-Static-PIE-does-not-work-on-musl-ppc.patch b/meta/recipes-core/musl/gcompat/0001-make-Static-PIE-does-not-work-on-musl-ppc.patch
new file mode 100644
index 0000000000..1d731163d0
--- /dev/null
+++ b/meta/recipes-core/musl/gcompat/0001-make-Static-PIE-does-not-work-on-musl-ppc.patch
@@ -0,0 +1,30 @@
1From 01180e78fe9568e7fb2673ba61801c42f0f70115 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 11 Mar 2022 10:37:51 -0800
4Subject: [PATCH] make: Static PIE does not work on musl/ppc
5
6Fixes linker error e.g.
7"read-only segment has dynamic relocations"
8
9Upstream-Status: Inappropriate [OE specific]
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 Makefile | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/Makefile b/Makefile
16index cbb7634..69ee228 100644
17--- a/Makefile
18+++ b/Makefile
19@@ -76,7 +76,7 @@ ${LIBGCOMPAT_NAME}: ${LIBGCOMPAT_OBJ}
20 ${LIBGCOMPAT_OBJ}: ${LIBGCOMPAT_INCLUDE}
21
22 ${LOADER_NAME}: ${LOADER_OBJ}
23- ${CC} ${CFLAGS} ${LDFLAGS} -static-pie -o ${LOADER_NAME} ${LOADER_OBJ}
24+ ${CC} ${CFLAGS} ${LDFLAGS} -static -o ${LOADER_NAME} ${LOADER_OBJ}
25
26 .c.o:
27 ${CC} ${CPPFLAGS} ${CFLAGS} -c -D_BSD_SOURCE \
28--
292.35.1
30
diff --git a/meta/recipes-core/musl/gcompat_git.bb b/meta/recipes-core/musl/gcompat_git.bb
index cab1a97a84..962bcd8c75 100644
--- a/meta/recipes-core/musl/gcompat_git.bb
+++ b/meta/recipes-core/musl/gcompat_git.bb
@@ -7,8 +7,11 @@ HOMEPAGE = "https://git.adelielinux.org/adelie/gcompat"
7LICENSE = "NCSA" 7LICENSE = "NCSA"
8LIC_FILES_CHKSUM = "file://LICENSE;md5=eb33ef4af05a9c7602843afb7adfe792" 8LIC_FILES_CHKSUM = "file://LICENSE;md5=eb33ef4af05a9c7602843afb7adfe792"
9 9
10SRC_URI = "git://git.adelielinux.org/adelie/gcompat.git;protocol=https;branch=current" 10SRC_URI = "git://git.adelielinux.org/adelie/gcompat.git;protocol=https;branch=current \
11 11 "
12SRC_URI:append:powerpc = "\
13 file://0001-make-Static-PIE-does-not-work-on-musl-ppc.patch \
14 "
12PV = "1.0.0+1.1+git${SRCPV}" 15PV = "1.0.0+1.1+git${SRCPV}"
13SRCREV = "4d6a5156a6eb7f56b30d93853a872e36dadde81b" 16SRCREV = "4d6a5156a6eb7f56b30d93853a872e36dadde81b"
14 17