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 | |
| 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')
| -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 0000000000..40956434de --- /dev/null +++ b/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0003-build-Delete-libebl-from-required-libraries-during-l.patch @@ -0,0 +1,34 @@ +From 460851c15e807d1a2515dfb985423f8a6624f4aa Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 8 Jan 2020 19:14:19 -0800 +Subject: [PATCH 3/3] build: Delete libebl from required libraries during link + +This is a static library from elfutils, which is not made available when +static archives are disabled, this can result in link failures e.g. + +aarch64-yoe-linux-musl/9.2.0/ld: cannot find -lebl +collect2: error: ld returned 1 exit status +Makefile:93: recipe for target 'makedumpfile' failed + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 5dce589..c3a4054 100644 +--- a/Makefile ++++ b/Makefile +@@ -51,7 +51,7 @@ OBJ_PART=$(patsubst %.c,%.o,$(SRC_PART)) + 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 + OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH)) + +-LIBS = -ldw -lbz2 -lebl -ldl -lelf -lz ++LIBS = -ldw -lbz2 -ldl -lelf -lz + ifneq ($(LINKTYPE), dynamic) + LIBS := $(LIBS) + endif +-- +2.24.1 + 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 9c357bf6e6..6924e39d60 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 = "\ ${SOURCEFORGE_MIRROR}/makedumpfile/${BPN}-${PV}.tar.gz \ file://0001-makedumpfile-replace-hardcode-CFLAGS.patch \ file://0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch \ + file://0003-build-Delete-libebl-from-required-libraries-during-l.patch \ " SRC_URI[md5sum] = "6fd632b97ad78d9a0a3b0f0989094064" SRC_URI[sha256sum] = "d007eec05cb14f0155f2d06a0d4dc70d321dbb2aec65fccdce953145c8230324" |