diff options
Diffstat (limited to 'sys-apps/attr/attr-9999.ebuild')
| -rw-r--r-- | sys-apps/attr/attr-9999.ebuild | 49 |
1 files changed, 6 insertions, 43 deletions
diff --git a/sys-apps/attr/attr-9999.ebuild b/sys-apps/attr/attr-9999.ebuild index c8051fdd82e4..f240734877d9 100644 --- a/sys-apps/attr/attr-9999.ebuild +++ b/sys-apps/attr/attr-9999.ebuild @@ -1,11 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -# autotools inherit only needed for 2.5.1-r1 patch for symvers -# hopefully in next release -inherit autotools flag-o-matic toolchain-funcs multilib-minimal usr-ldscript +inherit multilib-minimal if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://git.savannah.gnu.org/git/${PN}.git" @@ -13,21 +11,21 @@ if [[ ${PV} == 9999 ]] ; then else inherit libtool - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="Extended attributes tools" HOMEPAGE="https://savannah.nongnu.org/projects/attr" -LICENSE="LGPL-2.1" +LICENSE="LGPL-2.1+" SLOT="0" IUSE="debug nls static-libs" BDEPEND="nls? ( sys-devel/gettext )" PATCHES=( - "${FILESDIR}"/${PN}-2.5.1-fix-symver.patch + "${FILESDIR}/${PN}-2.5.2-r1-musl-1.2.5.patch" ) src_prepare() { @@ -39,20 +37,10 @@ src_prepare() { eautoreconf else # bug #580792 - #elibtoolize - - # Temporarily for 2.5.1-r1 for symver patch - eautoreconf + elibtoolize fi } -src_configure() { - # bug #760857 - append-lfs-flags - - multilib-minimal_src_configure -} - multilib_src_configure() { local myeconfargs=( --bindir="${EPREFIX}"/bin @@ -69,31 +57,6 @@ multilib_src_configure() { multilib_src_install() { emake DESTDIR="${D}" install - # Sanity check until we track down why this is happening. bug #644048 - local lib="${ED}/usr/$(get_libdir)/libattr.so.1" - if [[ -e ${lib} ]] ; then - local versions=$($(tc-getREADELF) -V "${lib}") - local symbols=$($(tc-getREADELF) -sW "${lib}") - if [[ "${versions}" != *"ATTR_1.0"* || \ - "${versions}" != *"ATTR_1.1"* || \ - "${versions}" != *"ATTR_1.2"* || \ - "${versions}" != *"ATTR_1.3"* || \ - "${symbols}" != *"getxattr@ATTR_1.0"* ]] ; then - echo "# readelf -V ${lib}" - echo "${versions}" - echo "# readelf -sW ${lib}" - echo "${symbols}" - die "Symbol version sanity check failed; please comment on https://bugs.gentoo.org/644048" - else - einfo "${lib} passed symbol checks" - fi - fi - - if multilib_is_native_abi; then - # We install attr into /bin, so we need the shared lib with it - gen_usr_ldscript -a attr - fi - # Add a wrapper until people upgrade. # TODO: figure out when this was added & when we can drop it! insinto /usr/include/attr |