diff options
author | Khem Raj <raj.khem@gmail.com> | 2023-09-22 14:05:07 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-09-26 10:35:28 +0100 |
commit | bb89cec62e48fc527b85403811769c7700e33ec9 (patch) | |
tree | 381a0b2511ba5dfef857671b3a9ec351c8b5d185 | |
parent | c7fdb5aca58f1a9d37905588c61cafaf585e9ff9 (diff) | |
download | poky-bb89cec62e48fc527b85403811769c7700e33ec9.tar.gz |
elfutils: Depend on musl-legacy-error for musl targets
this ensures a gnu compatible error APIs are made available, the patch
to workaround this is no longer needed.
(From OE-Core rev: 07b17f387dd70f25adb2f3159c64707bfa3291f5)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/elfutils/elfutils_0.189.bb | 3 | ||||
-rw-r--r-- | meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch | 37 |
2 files changed, 1 insertions, 39 deletions
diff --git a/meta/recipes-devtools/elfutils/elfutils_0.189.bb b/meta/recipes-devtools/elfutils/elfutils_0.189.bb index d6352de5cf..d8bf82b022 100644 --- a/meta/recipes-devtools/elfutils/elfutils_0.189.bb +++ b/meta/recipes-devtools/elfutils/elfutils_0.189.bb | |||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ | |||
7 | file://debuginfod/debuginfod-client.c;endline=28;md5=f0a7c3170776866ee94e8f9225a6ad79 \ | 7 | file://debuginfod/debuginfod-client.c;endline=28;md5=f0a7c3170776866ee94e8f9225a6ad79 \ |
8 | " | 8 | " |
9 | DEPENDS = "zlib virtual/libintl" | 9 | DEPENDS = "zlib virtual/libintl" |
10 | DEPENDS:append:libc-musl = " argp-standalone fts musl-obstack " | 10 | DEPENDS:append:libc-musl = " argp-standalone fts musl-legacy-error musl-obstack" |
11 | # The Debian patches below are from: | 11 | # The Debian patches below are from: |
12 | # http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.176-1.debian.tar.xz | 12 | # http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.176-1.debian.tar.xz |
13 | SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \ | 13 | SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \ |
@@ -24,7 +24,6 @@ SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \ | |||
24 | " | 24 | " |
25 | SRC_URI:append:libc-musl = " \ | 25 | SRC_URI:append:libc-musl = " \ |
26 | file://0003-musl-utils.patch \ | 26 | file://0003-musl-utils.patch \ |
27 | file://0015-config-eu.am-do-not-use-Werror.patch \ | ||
28 | " | 27 | " |
29 | SRC_URI[sha256sum] = "39bd8f1a338e2b7cd4abc3ff11a0eddc6e690f69578a57478d8179b4148708c8" | 28 | SRC_URI[sha256sum] = "39bd8f1a338e2b7cd4abc3ff11a0eddc6e690f69578a57478d8179b4148708c8" |
30 | 29 | ||
diff --git a/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch b/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch deleted file mode 100644 index 9ee5801c56..0000000000 --- a/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | From c209233857a73970d7a7dd8da664903570efc7ea Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Mon, 22 Jun 2020 21:35:16 +0000 | ||
4 | Subject: [PATCH] config/eu.am: do not use -Werror | ||
5 | |||
6 | Due to re-definition of error() on musl, gcc starts throwing | ||
7 | errors where none happen with glibc. Since upstream is not | ||
8 | likely to be interested in musl builds, lets just disable | ||
9 | Werror. | ||
10 | |||
11 | Upstream-Status: Inappropriate [oe core specific] | ||
12 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
13 | |||
14 | --- | ||
15 | config/eu.am | 2 -- | ||
16 | 1 file changed, 2 deletions(-) | ||
17 | diff --git a/config/eu.am b/config/eu.am | ||
18 | index e6c241f..4136e7c 100644 | ||
19 | --- a/config/eu.am | ||
20 | +++ b/config/eu.am | ||
21 | @@ -99,7 +99,6 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \ | ||
22 | $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \ | ||
23 | $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \ | ||
24 | $(USE_AFTER_FREE3_WARNING) \ | ||
25 | - $(if $($(*F)_no_Werror),,-Werror) \ | ||
26 | $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ | ||
27 | $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ | ||
28 | $(if $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \ | ||
29 | @@ -109,7 +108,6 @@ AM_CXXFLAGS = -std=c++11 -Wall -Wshadow \ | ||
30 | $(TRAMPOLINES_WARNING) \ | ||
31 | $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \ | ||
32 | $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \ | ||
33 | - $(if $($(*F)_no_Werror),,-Werror) \ | ||
34 | $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ | ||
35 | $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ | ||
36 | $(if $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \ | ||
37 | -- | ||