From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B9476158020 for ; Sat, 3 Dec 2022 13:03:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8E94CE0D86; Sat, 3 Dec 2022 13:03:58 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 73A62E0D86 for ; Sat, 3 Dec 2022 13:03:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6AC8134144D for ; Sat, 3 Dec 2022 13:03:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B087476F for ; Sat, 3 Dec 2022 13:03:55 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1670072626.38fce7bd2ecad6fcb9be4d02222f4a2207d490c2.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/libabigail/files/, dev-util/libabigail/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/libabigail/Manifest dev-util/libabigail/files/libabigail-2.0-musl.patch dev-util/libabigail/libabigail-2.0-r1.ebuild X-VCS-Directories: dev-util/libabigail/files/ dev-util/libabigail/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 38fce7bd2ecad6fcb9be4d02222f4a2207d490c2 X-VCS-Branch: master Date: Sat, 3 Dec 2022 13:03:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1e96683e-8ce3-4e08-86bd-00c01c580651 X-Archives-Hash: 3e3168acd7146dc4046fa026f9ff4d99 commit: 38fce7bd2ecad6fcb9be4d02222f4a2207d490c2 Author: David Seifert gentoo org> AuthorDate: Sat Dec 3 13:03:46 2022 +0000 Commit: David Seifert gentoo org> CommitDate: Sat Dec 3 13:03:46 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38fce7bd dev-util/libabigail: drop 2.0-r1 Closes: https://bugs.gentoo.org/868189 Signed-off-by: David Seifert gentoo.org> dev-util/libabigail/Manifest | 1 - .../libabigail/files/libabigail-2.0-musl.patch | 72 ------------------ dev-util/libabigail/libabigail-2.0-r1.ebuild | 85 ---------------------- 3 files changed, 158 deletions(-) diff --git a/dev-util/libabigail/Manifest b/dev-util/libabigail/Manifest index e4c455d73130..38f82118bf26 100644 --- a/dev-util/libabigail/Manifest +++ b/dev-util/libabigail/Manifest @@ -1,4 +1,3 @@ -DIST libabigail-2.0.tar.gz 286383045 BLAKE2B 2ba6f59bcd7a1484c4a60c6c9f212ad76af239a552d2cc9e47748e0db52363afadd7a99ef3e123c263de34b416f71b9d679bf2a5c542c419bb38ee75f3d5c57b SHA512 288f63f3495f0cd38258c50b78f30a573e43ab60494fefa22c8cba6d6776c5f94742ffea26297a232b78d25f6804f1b3f51febd59ec487733e6ef683cef2c180 DIST libabigail-2.1-docs.tar.xz 45532 BLAKE2B e59198a4ecdc6e0eef2b53ce62daa7a313e3dd3f28b71bc7184ec44745b165fab05bb08d22aa9a5e7f886c3b9156f0713737aa2899b579555b18daf8894e6a43 SHA512 078639bd08fdf190b8e71fe147495e0b6b14c7947e82d7aa5f5943ba00cf02763dc8c63a7d39189958a6cfb5175efff6a87cd74938fb3df8f7e123c5586605a6 DIST libabigail-2.1.tar.gz 405861148 BLAKE2B 28c8c7cfc33b5002d10b94e2eb9e16ef403dcce73c1404b8af011d8bf71b142b62a5079154af078a479b4528f8464c420322b814e75bb3127a09992e7ca8f84f SHA512 4fe1d3323f078a76a7529c15a809d0c0d3ac43cabd5ab4bb5c2d03992cbbb61bae3ec858e40796bf9f65029cbc779d258ae4559455178fb95cb8b53bf92bcc9a DIST libabigail-2.2-docs.tar.xz 46776 BLAKE2B 469981ea9879b202bcfd68dfa1d71c25470c6c9b9a8058ff29923a4cb7ecd5cb652b239bf6faa05c6b7e479b425e2fd4327a0d6e1703f3622299d743b72e8b5c SHA512 c06bfa95957390ca7abd1e47a79e2da813fd3bdfb8dcaf23bf81da697c77b67d9cd5457010291e2753fcc74f55803a1c81234aa3b8cb27c6b1ce3991f6ab60ab diff --git a/dev-util/libabigail/files/libabigail-2.0-musl.patch b/dev-util/libabigail/files/libabigail-2.0-musl.patch deleted file mode 100644 index 6057c65622a6..000000000000 --- a/dev-util/libabigail/files/libabigail-2.0-musl.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -143,6 +143,7 @@ - dnl ************************************************* - - AC_PROG_CXX -+AC_CANONICAL_HOST - AC_USE_SYSTEM_EXTENSIONS - AC_PROG_INSTALL - -@@ -201,6 +202,12 @@ - [CFLAGS="$CFLAGS -DBAD_FTS=1", - CXXFLAGS="$CXXFLAGS -DBAD_FTS=1"]) - -+dnl On musl, we need to find fts-standalone -+AS_CASE( -+ [${host_os}], [*-musl*], [ -+ PKG_CHECK_MODULES([FTS], [fts-standalone]) -+]) -+ - dnl Check for dependency: libelf, libdw, libebl (elfutils) - dnl Note that we need to use at least elfutils 0.159 but - dnl at that time elfutils didnt have pkgconfig capabilities ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -41,12 +41,12 @@ - abg-symtab-reader.cc \ - $(VIZ_SOURCES) - --libabigail_la_LIBADD = $(DEPS_LIBS) -+libabigail_la_LIBADD = $(DEPS_LIBS) $(FTS_LIBS) - libabigail_la_LDFLAGS = -lpthread -Wl,--as-needed -no-undefined - - CUSTOM_MACROS = -DABIGAIL_ROOT_SYSTEM_LIBDIR=\"${libdir}\" - - AM_CPPFLAGS=\ --$(CUSTOM_MACROS) $(DEPS_CPPFLAGS) \ -+$(CUSTOM_MACROS) $(DEPS_CPPFLAGS) $(FTS_CFLAGS) \ - -Wall -I$(abs_top_srcdir) -I$(abs_top_srcdir)/include \ - -I$(abs_top_builddir)/include -I$(abs_top_builddir) ---- a/tools/abisym.cc -+++ b/tools/abisym.cc -@@ -11,6 +11,7 @@ - /// in its symbol tables and report what it sees. - - #include -+#include - #include - #include - #include ---- a/tools/kmidiff.cc -+++ b/tools/kmidiff.cc -@@ -11,7 +11,6 @@ - - #include - #include --#include - #include - #include - #include ---- a/tools/Makefile.am -+++ b/tools/Makefile.am -@@ -37,7 +37,8 @@ - - abipkgdiff_SOURCES = abipkgdiff.cc - abipkgdiffdir = $(bindir) --abipkgdiff_LDADD = $(abs_top_builddir)/src/libabigail.la -+abipkgdiff_CPPFLAGS = $(FTS_CFLAGS) -+abipkgdiff_LDADD = $(abs_top_builddir)/src/libabigail.la $(FTS_LIBS) - abipkgdiff_LDFLAGS = -pthread - - kmidiff_SOURCES = kmidiff.cc diff --git a/dev-util/libabigail/libabigail-2.0-r1.ebuild b/dev-util/libabigail/libabigail-2.0-r1.ebuild deleted file mode 100644 index 96de89727269..000000000000 --- a/dev-util/libabigail/libabigail-2.0-r1.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) - -inherit autotools bash-completion-r1 python-any-r1 out-of-source - -DESCRIPTION="Suite of tools for checking ABI differences between ELF objects" -HOMEPAGE="https://sourceware.org/libabigail/" -SRC_URI="https://mirrors.kernel.org/sourceware/libabigail/${P}.tar.gz" - -LICENSE="Apache-2.0-with-LLVM-exceptions" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv" -IUSE="doc test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/elfutils - dev-libs/libxml2:2 - elibc_musl? ( sys-libs/fts-standalone )" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig - doc? ( - app-doc/doxygen - dev-python/sphinx - sys-apps/texinfo - ) - test? ( ${PYTHON_DEPS} )" - -PATCHES=( "${FILESDIR}"/${P}-musl.patch ) - -src_prepare() { - default - # need to run our autotools, due to ltmain.sh including Redhat calls: - # cannot read spec file '/usr/lib/rpm/redhat/redhat-hardened-ld': No such file or directory - eautoreconf -} - -my_src_configure() { - econf \ - --disable-deb \ - --disable-fedabipkgdiff \ - --disable-rpm \ - --disable-rpm415 \ - --disable-static \ - --enable-bash-completion \ - --enable-python3 \ - $(use_enable doc apidoc) \ - $(use_enable doc manual) -} - -my_src_compile() { - default - use doc && emake doc -} - -my_src_install() { - emake DESTDIR="${D}" install - - if use doc; then - doman doc/manuals/man/* - doinfo doc/manuals/texinfo/abigail.info - - dodoc -r doc/manuals/html - - docinto html/api - dodoc -r doc/api/html/. - fi -} - -my_src_install_all() { - einstalldocs - - local file - for file in abicompat abidiff abidw abilint abinilint abipkgdiff abisym fedabipkgdiff ; do - dobashcomp bash-completion/${file} - done - - # no static archives - find "${D}" -name '*.la' -delete || die -}