diff options
author | Khem Raj <raj.khem@gmail.com> | 2022-03-12 23:59:30 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-15 08:40:09 +0000 |
commit | 27e7af17f8d77a69cbd6373c5bb0b902194056ef (patch) | |
tree | f84ad7682957bd0002c0d28e981a45cb4185a5aa /meta/recipes-core | |
parent | 55e7265f47270b56429e65f076ecfbe24f2db7c2 (diff) | |
download | poky-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.patch | 30 | ||||
-rw-r--r-- | meta/recipes-core/musl/gcompat_git.bb | 7 |
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 @@ | |||
1 | From 01180e78fe9568e7fb2673ba61801c42f0f70115 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 11 Mar 2022 10:37:51 -0800 | ||
4 | Subject: [PATCH] make: Static PIE does not work on musl/ppc | ||
5 | |||
6 | Fixes linker error e.g. | ||
7 | "read-only segment has dynamic relocations" | ||
8 | |||
9 | Upstream-Status: Inappropriate [OE specific] | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | Makefile | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/Makefile b/Makefile | ||
16 | index 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 | -- | ||
29 | 2.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" | |||
7 | LICENSE = "NCSA" | 7 | LICENSE = "NCSA" |
8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=eb33ef4af05a9c7602843afb7adfe792" | 8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=eb33ef4af05a9c7602843afb7adfe792" |
9 | 9 | ||
10 | SRC_URI = "git://git.adelielinux.org/adelie/gcompat.git;protocol=https;branch=current" | 10 | SRC_URI = "git://git.adelielinux.org/adelie/gcompat.git;protocol=https;branch=current \ |
11 | 11 | " | |
12 | SRC_URI:append:powerpc = "\ | ||
13 | file://0001-make-Static-PIE-does-not-work-on-musl-ppc.patch \ | ||
14 | " | ||
12 | PV = "1.0.0+1.1+git${SRCPV}" | 15 | PV = "1.0.0+1.1+git${SRCPV}" |
13 | SRCREV = "4d6a5156a6eb7f56b30d93853a872e36dadde81b" | 16 | SRCREV = "4d6a5156a6eb7f56b30d93853a872e36dadde81b" |
14 | 17 | ||