[oe-commits] [openembedded-core] 19/40: elfutils: add PACKAGECONFIG for compression algorithms

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit ef255fb50d1da911b6f4c2f62d03a75e780fc6f5
Author: Dan Callaghan <dan.callaghan at opengear.com>
AuthorDate: Wed Oct 16 08:44:56 2019 +1000

    elfutils: add PACKAGECONFIG for compression algorithms
    
    Elfutils has optional support for bzip2 and xz (lzma). It uses
    this for decompressing embedded ELF sections like the .gnu_debugdata
    section for "mini debuginfo":
    
    https://sourceware.org/gdb/onlinedocs/gdb/MiniDebugInfo.html
    
    Previously this support was unconditionally disabled but the reasons for
    disabling them seem to no longer apply. Both the target and native
    variants of elfutils can build successfully against both bzip2 and xz.
    
    Signed-off-by: Dan Callaghan <dan.callaghan at opengear.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/recipes-devtools/elfutils/elfutils_0.177.bb | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-devtools/elfutils/elfutils_0.177.bb b/meta/recipes-devtools/elfutils/elfutils_0.177.bb
index 8187942..da0e958 100644
--- a/meta/recipes-devtools/elfutils/elfutils_0.177.bb
+++ b/meta/recipes-devtools/elfutils/elfutils_0.177.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://sourceware.org/elfutils"
 SECTION = "base"
 LICENSE = "GPLv2 & LGPLv3+ & GPLv3+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-DEPENDS = "bzip2 zlib virtual/libintl"
+DEPENDS = "zlib virtual/libintl"
 DEPENDS_append_libc-musl = " argp-standalone fts 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
@@ -46,8 +46,15 @@ SRC_URI[sha256sum] = "fa489deccbcae7d8c920f60d85906124c1989c591196d90e0fd668e3dc
 
 inherit autotools gettext ptest
 
-EXTRA_OECONF = "--program-prefix=eu- --without-lzma"
-EXTRA_OECONF_append_class-native = " --without-bzlib"
+EXTRA_OECONF = "--program-prefix=eu-"
+
+DEPENDS_BZIP2 = "bzip2-replacement-native"
+DEPENDS_BZIP2_class-target = "bzip2"
+
+PACKAGECONFIG ??= "bzip2"
+PACKAGECONFIG[bzip2] = "--with-bzlib,--without-bzlib,${DEPENDS_BZIP2}"
+PACKAGECONFIG[xz] = "--with-lzma,--without-lzma,xz"
+
 RDEPENDS_${PN}-ptest += "libasm libelf bash make coreutils ${PN}-binutils"
 
 EXTRA_OECONF_append_class-target += "--disable-tests-rpath"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.