diff options
Diffstat (limited to 'poky/meta/recipes-devtools/elfutils')
-rw-r--r-- | poky/meta/recipes-devtools/elfutils/elfutils_0.189.bb | 6 | ||||
-rw-r--r-- | poky/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch | 37 |
2 files changed, 4 insertions, 39 deletions
diff --git a/poky/meta/recipes-devtools/elfutils/elfutils_0.189.bb b/poky/meta/recipes-devtools/elfutils/elfutils_0.189.bb index 236f8cef92..d8bf82b022 100644 --- a/poky/meta/recipes-devtools/elfutils/elfutils_0.189.bb +++ b/poky/meta/recipes-devtools/elfutils/elfutils_0.189.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ file://debuginfod/debuginfod-client.c;endline=28;md5=f0a7c3170776866ee94e8f9225a6ad79 \ " DEPENDS = "zlib virtual/libintl" -DEPENDS:append:libc-musl = " argp-standalone fts musl-obstack " +DEPENDS:append:libc-musl = " argp-standalone fts musl-legacy-error musl-obstack" # The Debian patches below are from: # http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.176-1.debian.tar.xz 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 \ " SRC_URI:append:libc-musl = " \ file://0003-musl-utils.patch \ - file://0015-config-eu.am-do-not-use-Werror.patch \ " SRC_URI[sha256sum] = "39bd8f1a338e2b7cd4abc3ff11a0eddc6e690f69578a57478d8179b4148708c8" @@ -32,6 +31,9 @@ inherit autotools gettext ptest pkgconfig EXTRA_OECONF = "--program-prefix=eu-" +# Only used at runtime for make check but we want deterministic makefiles for ptest so hardcode +CACHED_CONFIGUREVARS += "ac_cv_prog_HAVE_BUNZIP2=yes" + BUILD_CFLAGS += "-Wno-error=stringop-overflow" DEPENDS_BZIP2 = "bzip2-replacement-native" diff --git a/poky/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch b/poky/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch deleted file mode 100644 index 9ee5801c56..0000000000 --- a/poky/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch +++ /dev/null @@ -1,37 +0,0 @@ -From c209233857a73970d7a7dd8da664903570efc7ea Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Mon, 22 Jun 2020 21:35:16 +0000 -Subject: [PATCH] config/eu.am: do not use -Werror - -Due to re-definition of error() on musl, gcc starts throwing -errors where none happen with glibc. Since upstream is not -likely to be interested in musl builds, lets just disable -Werror. - -Upstream-Status: Inappropriate [oe core specific] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> - ---- - config/eu.am | 2 -- - 1 file changed, 2 deletions(-) -diff --git a/config/eu.am b/config/eu.am -index e6c241f..4136e7c 100644 ---- a/config/eu.am -+++ b/config/eu.am -@@ -99,7 +99,6 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \ - $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \ - $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \ - $(USE_AFTER_FREE3_WARNING) \ -- $(if $($(*F)_no_Werror),,-Werror) \ - $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ - $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ - $(if $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \ -@@ -109,7 +108,6 @@ AM_CXXFLAGS = -std=c++11 -Wall -Wshadow \ - $(TRAMPOLINES_WARNING) \ - $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \ - $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \ -- $(if $($(*F)_no_Werror),,-Werror) \ - $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ - $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ - $(if $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \ --- |