Adapt configure options accordingly.

Since 0.180, the libebl_$ARCH.so libraries are compiled into libdw.so,
so they don't have to be installed separately any more. See upstream
commit 4f937e24dc7ad1820fc7c99a6dd6422657f14666 for details.

Signed-off-by: Robert Schwebel <[email protected]>
---
 rules/host-libelf.make |  4 +++-
 rules/libelf.make      | 12 +++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

Changes in v2:
* add configure options for host-libelf as well

diff --git a/rules/host-libelf.make b/rules/host-libelf.make
index 7a319b9f3..25ff97259 100644
--- a/rules/host-libelf.make
+++ b/rules/host-libelf.make
@@ -28,11 +28,13 @@ HOST_LIBELF_CONF_OPT        := \
        --disable-gcov \
        --disable-sanitize-undefined \
        --disable-valgrind \
+       --disable-valgrind-annotations \
        --disable-tests-rpath \
-       --enable-libebl-subdir=elfutils \
        --enable-textrelcheck \
        --enable-symbol-versioning \
        --disable-nls \
+       --disable-debuginfod \
+       --without-valgrind \
        --with-zlib \
        --without-bzlib \
        --without-lzma \
diff --git a/rules/libelf.make b/rules/libelf.make
index 815ac1205..21cbf3b32 100644
--- a/rules/libelf.make
+++ b/rules/libelf.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIBELF) += libelf
 #
 # Paths and names
 #
-LIBELF_VERSION := 0.176
-LIBELF_MD5     := 077e4f49320cad82bf17a997068b1db9
+LIBELF_VERSION := 0.180
+LIBELF_MD5     := 23feddb1b3859b03ffdbaf53ba6bd09b
 LIBELF         := elfutils-$(LIBELF_VERSION)
 LIBELF_SUFFIX  := tar.bz2
 LIBELF_URL     := 
https://sourceware.org/elfutils/ftp/$(LIBELF_VERSION)/$(LIBELF).$(LIBELF_SUFFIX)
@@ -42,11 +42,13 @@ LIBELF_CONF_OPT     := \
        --disable-gcov \
        --disable-sanitize-undefined \
        --disable-valgrind \
+       --disable-valgrind-annotations \
        --disable-tests-rpath \
-       --enable-libebl-subdir=elfutils \
        --enable-textrelcheck \
        --enable-symbol-versioning \
        --disable-nls \
+       --disable-debuginfod \
+       --without-valgrind \
        --with-zlib \
        --without-bzlib \
        --without-lzma \
@@ -74,10 +76,6 @@ $(STATEDIR)/libelf.targetinstall:
 
 ifdef PTXCONF_LIBELF_LIBDW
        @$(call install_lib, libelf, 0, 0, 0644, libdw-$(LIBELF_VERSION))
-       @$(call install_lib, libelf, 0, 0, 0644, \
-               elfutils/libebl_$(LIBELF_ARCH)-$(LIBELF_VERSION))
-       @$(call install_link, libelf, 
libebl_$(LIBELF_ARCH)-$(LIBELF_VERSION).so, \
-               /usr/lib/elfutils/libebl_$(LIBELF_ARCH).so)
 endif
 
 ifdef PTXCONF_LIBELF_LIBASM
-- 
2.27.0


_______________________________________________
ptxdist mailing list
[email protected]
To unsubscribe, send a mail with subject "unsubscribe" to 
[email protected]

Reply via email to