From nobody Tue May 10 22:50:21 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 2BFFA1AD08F7; Tue, 10 May 2022 22:50:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KyYCd6JZmz4WsH; Tue, 10 May 2022 22:50:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652223022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wVrSruvfHWOCe/KJQUzG9Iztd8Q+DBTpLYS77p+B6so=; b=uJ+P0fu/v7BA/eBBY0HOYDoDmKb2Rcp8XUHp+apGSVjb0hKwFmuFJLOudo7IcNeZWxb4xP CeV9t/Vi+X7tl9drg+ifryujn98A2vqPXBYwqXLRZ6WhE75bSJmLDsyJaZJ5NlbOresTJi Ppu12owwxWq+/QsfClINEFNVSdOwDyvY2JnQ2Dgx8q/1SswToxOaf2TcGPXl7NYUahhLfm zWlcY8fKCQLngG+V7ObPFf3YJGcZNOG01oYie5a2Llg++O93N4JWG80FOzXXORPUiceODK Cbi08vOClcHTfWVA+wTy57kdasjyFn46hg7U4p4o42Ss8lTSoN6auT/Q7vIUBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AA671626A; Tue, 10 May 2022 22:50:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24AMoL1a026257; Tue, 10 May 2022 22:50:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24AMoLg8026248; Tue, 10 May 2022 22:50:21 GMT (envelope-from git) Date: Tue, 10 May 2022 22:50:21 GMT Message-Id: <202205102250.24AMoLg8026248@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: c620f72bd278 - main - devel/elfutils: Update 0.179 -> 0.187 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c620f72bd27896977d389720e2da5792fcb094fb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652223022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wVrSruvfHWOCe/KJQUzG9Iztd8Q+DBTpLYS77p+B6so=; b=pDmQbeKGS3AhWXzF+pKQQwZwjL9y2ppAumcMwNkeP++gFoxX8Pix7E54dAIHvoTRH5fObd M3mnMcIgrBxNqiQqJf1mNrNr5ig8jZ6FO575DakVwfJq/3GMmqgX9a4LHzFPVCb+h++eLQ Ri8/u3w9+dGmSS3JCHxYp/CFr/TirpW5DbdR57xTCecvgnSY5Hre8cq/uQA7eZcRVyT3DU 51YEIUWSZaTaaWTW952PBQfpz7VHveXcqBiGoF/nx1OGq2dcUty3leELNyKSEzY4zM//E7 6iarwk5mY1x9i/CGotqaPKSJfPJ1hxfhPynjAmzXDCKqxXbfYQEOD6Ee5YRk8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652223022; a=rsa-sha256; cv=none; b=gOaeFyjVYoybyZYwYP7jDAmM4EIqUXkZoCZzRgalnOW5UMR4hAl7/m41olwCOXBqAgDgI3 ghjEOEW0dUrBbyrVPPBonkx7zQcmvno7UopY/ETP4SSBqaiY3BVkWSEiQ7r0eLLeaapB/0 UJa2JTpzJnCPhhIQFMpEfvGBctPSYH2ebot8RgtOB5VghNot56lnQ8nEFy5Tem8CeJq++D mspLqEJ4EkhLjSaeq6693/sONpw1uWkTR7W7JK/etHrE9MPsXwua6O2yIKHGAxrQCADE/f SfDupjvG8EBxHc+EDhIuTiHN0+uIUxX63lGp5+mJH2Qkx/ngzmNjx+c07LAAhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=c620f72bd27896977d389720e2da5792fcb094fb commit c620f72bd27896977d389720e2da5792fcb094fb Author: Yuri Victorovich AuthorDate: 2022-05-10 22:45:25 +0000 Commit: Yuri Victorovich CommitDate: 2022-05-10 22:50:01 +0000 devel/elfutils: Update 0.179 -> 0.187 PR: 263594 Approved by: cem@ (maintainer timeout; 14 days) --- devel/elfutils/Makefile | 20 ++++--- devel/elfutils/distinfo | 6 +- devel/elfutils/files/patch-config_Makefile.am | 12 ++++ devel/elfutils/files/patch-configure.ac | 27 +++++++++ .../files/patch-debuginfod_debuginfod-client.c | 47 ++++++++++++++++ devel/elfutils/files/patch-lib_Makefile.am | 8 +-- devel/elfutils/files/patch-lib_error.c | 3 + devel/elfutils/files/patch-lib_eu-config.h | 12 ++-- devel/elfutils/files/patch-libdw_Makefile.am | 11 ---- devel/elfutils/files/patch-libdwfl_dwfl__error.c | 22 -------- devel/elfutils/files/patch-libelf_elf__update.c | 18 ------ devel/elfutils/files/patch-src_readelf.c | 10 ---- devel/elfutils/files/patch-tests_Makefile.am | 64 +++------------------- devel/elfutils/pkg-plist | 18 ++++++ 14 files changed, 138 insertions(+), 140 deletions(-) diff --git a/devel/elfutils/Makefile b/devel/elfutils/Makefile index 3776e5021b13..b36e730360b1 100644 --- a/devel/elfutils/Makefile +++ b/devel/elfutils/Makefile @@ -1,7 +1,7 @@ # Created by: Conrad Meyer PORTNAME= elfutils -PORTVERSION= 0.179 +DISTVERSION= 0.187 CATEGORIES= devel MASTER_SITES= https://sourceware.org/elfutils/ftp/${PORTVERSION}/ @@ -17,11 +17,16 @@ LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING-LGPLV3 BROKEN_armv6= fails to build: fails to compile i386_disasm.c BROKEN_sparc64= sparc patch does not apply cleanly to 0.172 -LIB_DEPENDS= libargp.so:devel/argp-standalone +LIB_DEPENDS= libargp.so:devel/argp-standalone \ + libcurl.so:ftp/curl BUILD_DEPENDS= gnulib>=0:devel/gnulib PLIST_SUB= VERSION=${PORTVERSION} +CFLAGS+= -I${LOCALBASE}/share/gnulib/lib +LDFLAGS+= ${LOCALBASE}/lib/libargp.so \ + ${LOCALBASE}/lib/libintl.so + OPTIONS_DEFINE= MANPAGES NLS OPTIONS_DEFAULT= MANPAGES OPTIONS_SUB= yes @@ -32,17 +37,11 @@ NLS_CONFIGURE_ENABLE= nls USES= autoreconf cpe gmake libtool pkgconfig tar:bzip2 CPE_VENDOR= ${PORTNAME}_project -USE_GCC= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes +CFLAGS+= -Wno-error -Wno-format-nonliteral CFLAGS+= -Wno-null-dereference -Wno-unused-value -# For GCC8: -CFLAGS+= -Wno-cast-function-type -# Give i386 a prayer of building, and we can fix the warnings later: -CFLAGS_armv7= -Wno-error -CFLAGS_i386= -Wno-error -CFLAGS_powerpc= -Wno-error # Avoid conflict with binutils / elftoolchain programs with the same names: CONFIGURE_ARGS+= --program-prefix=eu- @@ -62,4 +61,7 @@ pre-configure: ${LOCALBASE}/share/gnulib/lib/obstack_printf.c \ ${WRKSRC}/lib +post-configure: # remove -Werror since it causes build failures + @${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} -e 's| -Werror| |; s|-Werror ||' + .include diff --git a/devel/elfutils/distinfo b/devel/elfutils/distinfo index 15b8211c8585..2e7575dac845 100644 --- a/devel/elfutils/distinfo +++ b/devel/elfutils/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1585570776 -SHA256 (elfutils-0.179.tar.bz2) = 25a545566cbacaa37ae6222e58f1c48ea4570f53ba991886e2f5ce96e22a23a2 -SIZE (elfutils-0.179.tar.bz2) = 9057637 +TIMESTAMP = 1650986624 +SHA256 (elfutils-0.187.tar.bz2) = e70b0dfbe610f90c4d1fe0d71af142a4e25c3c4ef9ebab8d2d72b65159d454c8 +SIZE (elfutils-0.187.tar.bz2) = 9240221 diff --git a/devel/elfutils/files/patch-config_Makefile.am b/devel/elfutils/files/patch-config_Makefile.am new file mode 100644 index 000000000000..82a815fda60d --- /dev/null +++ b/devel/elfutils/files/patch-config_Makefile.am @@ -0,0 +1,12 @@ +--- config/Makefile.am.orig 2022-04-25 20:56:39 UTC ++++ config/Makefile.am +@@ -38,9 +38,6 @@ if LIBDEBUGINFOD + pkgconfig_DATA += libdebuginfod.pc + + install-data-local: +- $(INSTALL_DATA) profile.sh -D $(DESTDIR)$(sysconfdir)/profile.d/debuginfod.sh +- $(INSTALL_DATA) profile.csh -D $(DESTDIR)$(sysconfdir)/profile.d/debuginfod.csh +- mkdir -p $(DESTDIR)$(sysconfdir)/debuginfod + if [ -n "@DEBUGINFOD_URLS@" ]; then \ + echo "@DEBUGINFOD_URLS@" > $(DESTDIR)$(sysconfdir)/debuginfod/elfutils.urls; \ + fi diff --git a/devel/elfutils/files/patch-configure.ac b/devel/elfutils/files/patch-configure.ac new file mode 100644 index 000000000000..8a9aee90c6b0 --- /dev/null +++ b/devel/elfutils/files/patch-configure.ac @@ -0,0 +1,27 @@ +--- configure.ac.orig 2022-04-26 17:30:35 UTC ++++ configure.ac +@@ -590,15 +590,15 @@ case "$ac_cv_search_fts_close" in + esac + AC_SUBST([fts_LIBS]) + +-saved_LIBS="$LIBS" +-AC_SEARCH_LIBS([_obstack_free], [obstack]) +-LIBS="$saved_LIBS" +-case "$ac_cv_search__obstack_free" in +- no) AC_MSG_FAILURE([failed to find _obstack_free]) ;; +- -l*) obstack_LIBS="$ac_cv_search__obstack_free" ;; +- *) obstack_LIBS= ;; +-esac +-AC_SUBST([obstack_LIBS]) ++#saved_LIBS="$LIBS" ++#AC_SEARCH_LIBS([_obstack_free], [obstack]) ++#LIBS="$saved_LIBS" ++#case "$ac_cv_search__obstack_free" in ++# no) AC_MSG_FAILURE([failed to find _obstack_free]) ;; ++# -l*) obstack_LIBS="$ac_cv_search__obstack_free" ;; ++# *) obstack_LIBS= ;; ++#esac ++#AC_SUBST([obstack_LIBS]) + + dnl The directories with content. + diff --git a/devel/elfutils/files/patch-debuginfod_debuginfod-client.c b/devel/elfutils/files/patch-debuginfod_debuginfod-client.c new file mode 100644 index 000000000000..6a9c844c9111 --- /dev/null +++ b/devel/elfutils/files/patch-debuginfod_debuginfod-client.c @@ -0,0 +1,47 @@ +--- debuginfod/debuginfod-client.c.orig 2022-04-26 18:12:52 UTC ++++ debuginfod/debuginfod-client.c +@@ -77,7 +77,7 @@ void debuginfod_end (debuginfod_client *c) { } + #include + #include + #include +-#include ++//#include + #include + #include + #include +@@ -1070,7 +1070,7 @@ debuginfod_query_server (debuginfod_client *c, + free (c->winning_headers); + c->winning_headers = NULL; + } +- if ( maxtime > 0 && clock_gettime(CLOCK_MONOTONIC_RAW, &start_time) == -1) ++ if ( maxtime > 0 && clock_gettime(CLOCK_MONOTONIC, &start_time) == -1) + { + rc = errno; + goto out2; +@@ -1081,7 +1081,7 @@ debuginfod_query_server (debuginfod_client *c, + /* Check to see how long querying is taking. */ + if (maxtime > 0) + { +- if (clock_gettime(CLOCK_MONOTONIC_RAW, &cur_time) == -1) ++ if (clock_gettime(CLOCK_MONOTONIC, &cur_time) == -1) + { + rc = errno; + goto out2; +@@ -1090,7 +1090,7 @@ debuginfod_query_server (debuginfod_client *c, + if ( delta > maxtime) + { + dprintf(vfd, "Timeout with max time=%lds and transfer time=%lds\n", maxtime, delta ); +- rc = -ETIME; ++ rc = -EINVAL; + goto out2; + } + } +@@ -1260,7 +1260,7 @@ debuginfod_query_server (debuginfod_client *c, + case CURLE_TOO_MANY_REDIRECTS: rc = -EMLINK; break; + case CURLE_SEND_ERROR: rc = -ECONNRESET; break; + case CURLE_RECV_ERROR: rc = -ECONNRESET; break; +- case CURLE_OPERATION_TIMEDOUT: rc = -ETIME; break; ++ case CURLE_OPERATION_TIMEDOUT: rc = -EINVAL; break; + case CURLE_HTTP_RETURNED_ERROR: + ok0 = curl_easy_getinfo (msg->easy_handle, + CURLINFO_RESPONSE_CODE, diff --git a/devel/elfutils/files/patch-lib_Makefile.am b/devel/elfutils/files/patch-lib_Makefile.am index 1acc2b47639e..feed71ace33d 100644 --- a/devel/elfutils/files/patch-lib_Makefile.am +++ b/devel/elfutils/files/patch-lib_Makefile.am @@ -1,11 +1,11 @@ ---- lib/Makefile.am.orig 2020-03-30 12:17:45 UTC +--- lib/Makefile.am.orig 2022-04-25 20:56:39 UTC +++ lib/Makefile.am @@ -35,7 +35,8 @@ noinst_LIBRARIES = libeu.a - libeu_a_SOURCES = xstrdup.c xstrndup.c xmalloc.c next_prime.c \ + libeu_a_SOURCES = xasprintf.c xstrdup.c xstrndup.c xmalloc.c next_prime.c \ crc32.c crc32_file.c \ -- color.c printversion.c -+ color.c printversion.c \ +- color.c error.c printversion.c ++ color.c error.c printversion.c \ + error.c obstack.c obstack_printf.c noinst_HEADERS = fixedsizehash.h libeu.h system.h dynamicsizehash.h list.h \ diff --git a/devel/elfutils/files/patch-lib_error.c b/devel/elfutils/files/patch-lib_error.c index e80726187fbf..379bbbae032e 100644 --- a/devel/elfutils/files/patch-lib_error.c +++ b/devel/elfutils/files/patch-lib_error.c @@ -65,3 +65,6 @@ + error_message_count++; +} + + /* Definitions for error fallback functions. + Copyright (C) 2021 Google, Inc. + This file is part of elfutils. diff --git a/devel/elfutils/files/patch-lib_eu-config.h b/devel/elfutils/files/patch-lib_eu-config.h index 04549063aa1c..c809d2dcc335 100644 --- a/devel/elfutils/files/patch-lib_eu-config.h +++ b/devel/elfutils/files/patch-lib_eu-config.h @@ -1,8 +1,8 @@ ---- lib/eu-config.h.orig 2020-03-30 12:17:45 UTC +--- lib/eu-config.h.orig 2022-04-25 20:56:39 UTC +++ lib/eu-config.h -@@ -176,6 +176,186 @@ asm (".section predict_data, \"aw\"; .previous\n" - #define ELFUTILS_HEADER(name) - +@@ -188,6 +188,186 @@ asm (".section predict_data, \"aw\"; .previous\n" + # define used_in_asm /* empty */ + #endif +/* FreeBSD ports of glibcisms */ +#include @@ -185,5 +185,5 @@ +#endif + #ifdef SYMBOL_VERSIONING - # define OLD_VERSION(name, version) \ - asm (".globl _compat." #version "." #name "\n" \ + # define NEW_INTDEF(name) __typeof (name) INTUSE(name) \ + __attribute__ ((alias ("_new." #name))) attribute_hidden; diff --git a/devel/elfutils/files/patch-libdw_Makefile.am b/devel/elfutils/files/patch-libdw_Makefile.am deleted file mode 100644 index 2d2f3545d3ac..000000000000 --- a/devel/elfutils/files/patch-libdw_Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ ---- libdw/Makefile.am.orig 2020-03-30 12:17:45 UTC -+++ libdw/Makefile.am -@@ -109,7 +109,7 @@ libdw_so_LIBS = ../libebl/libebl_pic.a ../backends/lib - ../libcpu/libcpu_pic.a libdw_pic.a ../libdwelf/libdwelf_pic.a \ - ../libdwfl/libdwfl_pic.a - libdw_so_DEPS = ../lib/libeu.a ../libelf/libelf.so --libdw_so_LDLIBS = $(libdw_so_DEPS) -ldl -lz $(argp_LDADD) $(zip_LIBS) -pthread -+libdw_so_LDLIBS = $(libdw_so_DEPS) -lz $(argp_LDADD) $(zip_LIBS) -pthread - libdw_so_SOURCES = - libdw.so$(EXEEXT): $(srcdir)/libdw.map $(libdw_so_LIBS) $(libdw_so_DEPS) - $(AM_V_CCLD)$(LINK) $(dso_LDFLAGS) -o $@ \ diff --git a/devel/elfutils/files/patch-libdwfl_dwfl__error.c b/devel/elfutils/files/patch-libdwfl_dwfl__error.c deleted file mode 100644 index 3a841a81d7aa..000000000000 --- a/devel/elfutils/files/patch-libdwfl_dwfl__error.c +++ /dev/null @@ -1,22 +0,0 @@ ---- libdwfl/dwfl_error.c.orig 2016-12-25 13:36:55 UTC -+++ libdwfl/dwfl_error.c -@@ -136,7 +136,7 @@ __libdwfl_seterrno (Dwfl_Error error) - global_error = canonicalize (error); - } - -- -+static __thread char strerr_buf[64]; - const char * - dwfl_errmsg (int error) - { -@@ -154,7 +154,9 @@ dwfl_errmsg (int error) - switch (error &~ 0xffff) - { - case OTHER_ERROR (ERRNO): -- return strerror_r (error & 0xffff, "bad", 0); -+ strcpy(strerr_buf, "bad"); -+ (void)strerror_r (error & 0xffff, strerr_buf, sizeof strerr_buf); -+ return strerr_buf; - case OTHER_ERROR (LIBELF): - return elf_errmsg (error & 0xffff); - case OTHER_ERROR (LIBDW): diff --git a/devel/elfutils/files/patch-libelf_elf__update.c b/devel/elfutils/files/patch-libelf_elf__update.c deleted file mode 100644 index 1ce9a75387ef..000000000000 --- a/devel/elfutils/files/patch-libelf_elf__update.c +++ /dev/null @@ -1,18 +0,0 @@ ---- libelf/elf_update.c.orig 2020-03-30 12:17:45 UTC -+++ libelf/elf_update.c -@@ -106,9 +106,13 @@ write_file (Elf *elf, int64_t size, int change_bo, siz - if (elf->cmd == ELF_C_RDWR_MMAP - && (size_t) size > elf->maximum_size) - { -- if (mremap (elf->map_address, elf->maximum_size, -- size, 0) == MAP_FAILED) -+ if (munmap (elf->map_address, elf->maximum_size) != 0 || -+ mmap (elf->map_address, size, PROT_READ | PROT_WRITE, -+ MAP_SHARED | MAP_FIXED | MAP_EXCL, elf->fildes, -+ 0) == MAP_FAILED) - { -+ elf->map_address = NULL; -+ elf->flags &= ~ELF_F_MMAPPED; - __libelf_seterrno (ELF_E_WRITE_ERROR); - return -1; - } diff --git a/devel/elfutils/files/patch-src_readelf.c b/devel/elfutils/files/patch-src_readelf.c deleted file mode 100644 index 77d8d89ac8f5..000000000000 --- a/devel/elfutils/files/patch-src_readelf.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/readelf.c.orig 2020-03-30 12:17:45 UTC -+++ src/readelf.c -@@ -10744,6 +10744,7 @@ print_debug_exception_table (Dwfl_Module *dwflmod __at - default: - dsize = 0; - error (1, 0, gettext ("invalid TType encoding")); -+ abort(); - } - - if (max_ar_filter diff --git a/devel/elfutils/files/patch-tests_Makefile.am b/devel/elfutils/files/patch-tests_Makefile.am index 09a86b266a15..b7d2991d0940 100644 --- a/devel/elfutils/files/patch-tests_Makefile.am +++ b/devel/elfutils/files/patch-tests_Makefile.am @@ -1,36 +1,15 @@ ---- tests/Makefile.am.orig 2020-03-30 12:17:45 UTC +--- tests/Makefile.am.orig 2022-04-25 20:56:39 UTC +++ tests/Makefile.am -@@ -537,7 +537,7 @@ libasm = -lasm - libebl = -lebl - else !STANDALONE +@@ -624,7 +624,7 @@ installcheck-local: + LOG_COMPILER="$(installed_LOG_COMPILER)" check-TESTS + if BUILD_STATIC -libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) $(libebl) -ldl -lpthread +libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) $(libebl) -lpthread libelf = ../libelf/libelf.a -lz libasm = ../libasm/libasm.a else -@@ -552,16 +552,16 @@ endif !STANDALONE - arextract_LDADD = $(libelf) - arsymtest_LDADD = $(libelf) - newfile_LDADD = $(libelf) --saridx_LDADD = $(libelf) -+saridx_LDADD = $(libeu) $(libelf) - scnnames_LDADD = $(libelf) --sectiondump_LDADD = $(libelf) -+sectiondump_LDADD = $(libeu) $(libelf) - showptable_LDADD = $(libelf) - hash_LDADD = $(libelf) - test_nlist_LDADD = $(libelf) - msg_tst_LDADD = $(libelf) - newscn_LDADD = $(libelf) --early_offscn_LDADD = $(libelf) --ecp_LDADD = $(libelf) -+early_offscn_LDADD = $(libeu) $(libelf) -+ecp_LDADD = $(libeu) $(libelf) - update1_LDADD = $(libelf) - update2_LDADD = $(libelf) - update3_LDADD = $(libdw) $(libelf) -@@ -575,12 +575,12 @@ get_files_LDADD = $(libdw) $(libelf) +@@ -662,12 +662,12 @@ get_files_LDADD = $(libdw) $(libelf) next_files_LDADD = $(libdw) $(libelf) get_aranges_LDADD = $(libdw) $(libelf) allfcts_LDADD = $(libdw) $(libelf) @@ -49,7 +28,7 @@ #show_ciefde_LDADD = ../libdwarf/libdwarf.so $(libelf) asm_tst1_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) asm_tst2_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) -@@ -592,13 +592,13 @@ asm_tst7_LDADD = $(libasm) $(libebl) $(libelf) $(libdw +@@ -679,13 +679,13 @@ asm_tst7_LDADD = $(libasm) $(libebl) $(libelf) $(libdw asm_tst8_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) asm_tst9_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) dwflmodtest_LDADD = $(libdw) $(libebl) $(libelf) $(argp_LDADD) @@ -66,7 +45,7 @@ dwarf_getmacros_LDADD = $(libdw) dwarf_ranges_LDADD = $(libdw) dwarf_getstring_LDADD = $(libdw) -@@ -612,10 +612,10 @@ typeiter2_LDADD = $(libdw) $(libelf) +@@ -699,10 +699,10 @@ typeiter2_LDADD = $(libdw) $(libelf) low_high_pc_LDADD = $(libdw) $(libelf) $(argp_LDADD) test_elf_cntl_gelf_getshdr_LDADD = $(libelf) dwflsyms_LDADD = $(libdw) $(libelf) $(argp_LDADD) @@ -80,32 +59,3 @@ backtrace_LDADD = $(libdw) $(libelf) $(argp_LDADD) # backtrace-child-biarch also uses those *_CFLAGS and *_LDLAGS variables: backtrace_child_CFLAGS = $(fpie_CFLAGS) -@@ -624,23 +624,23 @@ backtrace_child_biarch_SOURCES = backtrace-child.c - backtrace_data_LDADD = $(libdw) $(libelf) - backtrace_dwarf_CFLAGS = -Wno-unused-parameter - backtrace_dwarf_LDADD = $(libdw) $(libelf) --debuglink_LDADD = $(libdw) $(libelf) --debugaltlink_LDADD = $(libdw) $(libelf) --buildid_LDADD = $(libdw) $(libelf) -+debuglink_LDADD = $(libeu) $(libdw) $(libelf) -+debugaltlink_LDADD = $(libeu) $(libdw) $(libelf) -+buildid_LDADD = $(libeu) $(libdw) $(libelf) - deleted_LDADD = ./deleted-lib.so - deleted_lib_so_LDFLAGS = -shared - deleted_lib_so_CFLAGS = $(fpic_CFLAGS) -fasynchronous-unwind-tables - aggregate_size_LDADD = $(libdw) $(libelf) $(argp_LDADD) - peel_type_LDADD = $(libdw) $(libelf) $(argp_LDADD) - vdsosyms_LDADD = $(libdw) $(libelf) --getsrc_die_LDADD = $(libdw) $(libelf) -+getsrc_die_LDADD = $(libeu) $(libdw) $(libelf) - strptr_LDADD = $(libelf) - newdata_LDADD = $(libelf) - elfstrtab_LDADD = $(libelf) - dwfl_proc_attach_LDADD = $(libdw) - dwfl_proc_attach_LDFLAGS = -pthread $(AM_LDFLAGS) - elfshphehdr_LDADD =$(libelf) --elfstrmerge_LDADD = $(libdw) $(libelf) -+elfstrmerge_LDADD = $(libeu) $(libdw) $(libelf) - dwelfgnucompressed_LDADD = $(libelf) $(libdw) - elfgetchdr_LDADD = $(libelf) $(libdw) - elfgetzdata_LDADD = $(libelf) diff --git a/devel/elfutils/pkg-plist b/devel/elfutils/pkg-plist index f33c949034e5..dc90b20d20a6 100644 --- a/devel/elfutils/pkg-plist +++ b/devel/elfutils/pkg-plist @@ -1,3 +1,4 @@ +bin/debuginfod-find bin/eu-addr2line bin/eu-ar bin/eu-elfclassify @@ -16,6 +17,7 @@ bin/eu-strings bin/eu-strip bin/eu-unstrip include/dwarf.h +include/elfutils/debuginfod.h include/elfutils/elf-knowledge.h include/elfutils/known-dwarf.h include/elfutils/libasm.h @@ -30,6 +32,9 @@ lib/libasm-%%VERSION%%.so lib/libasm.a lib/libasm.so lib/libasm.so.1 +lib/libdebuginfod-%%VERSION%%.so +lib/libdebuginfod.so +lib/libdebuginfod.so.1 lib/libdw-%%VERSION%%.so lib/libdw.a lib/libdw.so @@ -38,14 +43,27 @@ lib/libelf-%%VERSION%%.so lib/libelf.a lib/libelf.so lib/libelf.so.1 +libdata/pkgconfig/libdebuginfod.pc libdata/pkgconfig/libdw.pc libdata/pkgconfig/libelf.pc +%%MANPAGES%%man/man1/debuginfod-find.1.gz %%MANPAGES%%man/man1/eu-elfclassify.1.gz %%MANPAGES%%man/man1/eu-readelf.1.gz +%%MANPAGES%%man/man3/debuginfod_add_http_header.3.gz +%%MANPAGES%%man/man3/debuginfod_begin.3.gz +%%MANPAGES%%man/man3/debuginfod_end.3.gz +%%MANPAGES%%man/man3/debuginfod_find_debuginfo.3.gz +%%MANPAGES%%man/man3/debuginfod_find_executable.3.gz +%%MANPAGES%%man/man3/debuginfod_find_source.3.gz +%%MANPAGES%%man/man3/debuginfod_get_url.3.gz +%%MANPAGES%%man/man3/debuginfod_get_user_data.3.gz +%%MANPAGES%%man/man3/debuginfod_set_progressfn.3.gz +%%MANPAGES%%man/man3/debuginfod_set_user_data.3.gz %%MANPAGES%%man/man3/elf_begin.3.gz %%MANPAGES%%man/man3/elf_clone.3.gz %%MANPAGES%%man/man3/elf_getdata.3.gz %%MANPAGES%%man/man3/elf_update.3.gz +%%MANPAGES%%man/man7/debuginfod-client-config.7.gz %%NLS%%share/locale/de/LC_MESSAGES/elfutils.mo %%NLS%%share/locale/en@boldquot/LC_MESSAGES/elfutils.mo %%NLS%%share/locale/en@quot/LC_MESSAGES/elfutils.mo