diff options
author | Khem Raj <raj.khem@gmail.com> | 2020-01-08 19:19:51 -0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-01-10 00:43:27 -0800 |
commit | 0d937f7e5c94bdf333fb381297950b73687d3517 (patch) | |
tree | dc2ba2e14834a4fb47c91e052071f2811b72c1fd /meta-oe/recipes-kernel/makedumpfile | |
parent | d4a1b8c52f6bd7d03696c5e172249a362b2a5dd0 (diff) | |
download | meta-openembedded-0d937f7e5c94bdf333fb381297950b73687d3517.tar.gz |
makedumpfile: Drop linking with libebl
This seems to be not needed as link succeeds without this library,
moreover this is static-only library in latest elfutils
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Alexander Kanavin <alex.kanavin@gmail.com>
Diffstat (limited to 'meta-oe/recipes-kernel/makedumpfile')
-rw-r--r-- | meta-oe/recipes-kernel/makedumpfile/makedumpfile/0003-build-Delete-libebl-from-required-libraries-during-l.patch | 34 | ||||
-rw-r--r-- | meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.6.bb | 1 |
2 files changed, 35 insertions, 0 deletions
diff --git a/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0003-build-Delete-libebl-from-required-libraries-during-l.patch b/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0003-build-Delete-libebl-from-required-libraries-during-l.patch new file mode 100644 index 000000000..40956434d --- /dev/null +++ b/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0003-build-Delete-libebl-from-required-libraries-during-l.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From 460851c15e807d1a2515dfb985423f8a6624f4aa Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 8 Jan 2020 19:14:19 -0800 | ||
4 | Subject: [PATCH 3/3] build: Delete libebl from required libraries during link | ||
5 | |||
6 | This is a static library from elfutils, which is not made available when | ||
7 | static archives are disabled, this can result in link failures e.g. | ||
8 | |||
9 | aarch64-yoe-linux-musl/9.2.0/ld: cannot find -lebl | ||
10 | collect2: error: ld returned 1 exit status | ||
11 | Makefile:93: recipe for target 'makedumpfile' failed | ||
12 | |||
13 | Upstream-Status: Pending | ||
14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
15 | --- | ||
16 | Makefile | 2 +- | ||
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/Makefile b/Makefile | ||
20 | index 5dce589..c3a4054 100644 | ||
21 | --- a/Makefile | ||
22 | +++ b/Makefile | ||
23 | @@ -51,7 +51,7 @@ OBJ_PART=$(patsubst %.c,%.o,$(SRC_PART)) | ||
24 | SRC_ARCH = arch/arm.c arch/arm64.c arch/x86.c arch/x86_64.c arch/ia64.c arch/ppc64.c arch/s390x.c arch/ppc.c arch/sparc64.c | ||
25 | OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH)) | ||
26 | |||
27 | -LIBS = -ldw -lbz2 -lebl -ldl -lelf -lz | ||
28 | +LIBS = -ldw -lbz2 -ldl -lelf -lz | ||
29 | ifneq ($(LINKTYPE), dynamic) | ||
30 | LIBS := $(LIBS) | ||
31 | endif | ||
32 | -- | ||
33 | 2.24.1 | ||
34 | |||
diff --git a/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.6.bb b/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.6.bb index 9c357bf6e..6924e39d6 100644 --- a/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.6.bb +++ b/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.6.bb | |||
@@ -24,6 +24,7 @@ SRC_URI = "\ | |||
24 | ${SOURCEFORGE_MIRROR}/makedumpfile/${BPN}-${PV}.tar.gz \ | 24 | ${SOURCEFORGE_MIRROR}/makedumpfile/${BPN}-${PV}.tar.gz \ |
25 | file://0001-makedumpfile-replace-hardcode-CFLAGS.patch \ | 25 | file://0001-makedumpfile-replace-hardcode-CFLAGS.patch \ |
26 | file://0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch \ | 26 | file://0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch \ |
27 | file://0003-build-Delete-libebl-from-required-libraries-during-l.patch \ | ||
27 | " | 28 | " |
28 | SRC_URI[md5sum] = "6fd632b97ad78d9a0a3b0f0989094064" | 29 | SRC_URI[md5sum] = "6fd632b97ad78d9a0a3b0f0989094064" |
29 | SRC_URI[sha256sum] = "d007eec05cb14f0155f2d06a0d4dc70d321dbb2aec65fccdce953145c8230324" | 30 | SRC_URI[sha256sum] = "d007eec05cb14f0155f2d06a0d4dc70d321dbb2aec65fccdce953145c8230324" |