diff options
| -rw-r--r-- | sys-libs/binutils-libs/Manifest | 4 | ||||
| -rw-r--r-- | sys-libs/binutils-libs/binutils-libs-2.34-r314.ebuild (renamed from sys-libs/binutils-libs/binutils-libs-2.31.1-r1337.ebuild) | 41 |
2 files changed, 27 insertions, 18 deletions
diff --git a/sys-libs/binutils-libs/Manifest b/sys-libs/binutils-libs/Manifest index 340ef4ae..7cea1217 100644 --- a/sys-libs/binutils-libs/Manifest +++ b/sys-libs/binutils-libs/Manifest @@ -1,2 +1,2 @@ -DIST binutils-2.31.1-patches-5.tar.xz 65896 BLAKE2B 7fb2c4c71336a77f3fef57a0430c511ef7326f8196d8f3a57a6d56aed464953172eeb0755f020387739cf27f709d0bc3de9c3c8b972a94f1480639465158e180 SHA512 c254f22b8ca662cf49cd5fc076d3e9b82d7f421420408c960c54310fc49462600325e7bc50f863cab7c8c49caebac3ac353dc24ab5947e8f01b98c11f43f57d2 -DIST binutils-2.31.1.tar.xz 20467996 BLAKE2B 6b914df1fbb7cf54f2159f71b2c2b09f3f6a569b7a3cb4cf9790d0a3733a7548bc0ea32334a178ed3b56e8b97656ae99c7abaf212601beeaeae9a0884c0f6051 SHA512 0fca326feb1d5f5fe505a827b20237fe3ec9c13eaf7ec7e35847fd71184f605ba1cefe1314b1b8f8a29c0aa9d88162849ee1c1a3e70c2f7407d88339b17edb30 +DIST binutils-2.34-patches-1.tar.xz 20388 BLAKE2B 8828505f62259a307de445357320827e7f6bc416a7f4c72140add505f62eef3928c7daec13be158b52c2a7a1d989f539025e4be6ec27ef80ede81477a42c5042 SHA512 951dffcc30ad5706dc48e71995217655c5d96472446ab66a357f19486b57d1868143a9809887eab7ba8c42c33124f8b37d3bab6618388ea8a08b4399d348a645 +DIST binutils-2.34.tar.xz 21637796 BLAKE2B 07dd23916a7d27f71c3f160c8c16abe2bd4fce294c738c665a012a3be6a87dbe8160d0c38740524f9025e01d438e99b2a94bcf9f9f79ee214f5dd033de8aad3d SHA512 2c7976939dcf5e8c5b7374cccd39bfe803b1bec73c6abfa0eb17c24e1942574c6bdb874c66a092a82adc443182eacd8a5a8001c19a76101f0c7ba40c27de0bbd diff --git a/sys-libs/binutils-libs/binutils-libs-2.31.1-r1337.ebuild b/sys-libs/binutils-libs/binutils-libs-2.34-r314.ebuild index 20355f9d..c7a02375 100644 --- a/sys-libs/binutils-libs/binutils-libs-2.31.1-r1337.ebuild +++ b/sys-libs/binutils-libs/binutils-libs-2.34-r314.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -PATCH_VER=5 -PATCH_DEV=dilfridge +PATCH_VER=1 +PATCH_DEV=slyfox -inherit eutils toolchain-funcs multilib-minimal +inherit eutils libtool toolchain-funcs multilib-minimal MY_PN="binutils" MY_P="${MY_PN}-${PV}" @@ -19,20 +19,16 @@ SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${MY_PN}-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz" LICENSE="|| ( GPL-3 LGPL-3 )" -# The shared lib SONAMEs use the ${PV} in them. -# -r1 is a one-off subslot bump where SONAME changed for bug #666100 -SLOT="0/${PVR}" +SLOT="0/${PV}" IUSE="64-bit-bfd multitarget nls static-libs" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -COMMON_DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]" -DEPEND="${COMMON_DEPEND} - >=sys-apps/texinfo-4.7 - nls? ( sys-devel/gettext )" +BDEPEND="nls? ( sys-devel/gettext )" +DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]" # Need a newer binutils-config that'll reset include/lib symlinks for us. -RDEPEND="${COMMON_DEPEND} +RDEPEND="${DEPEND} >=sys-devel/binutils-config-5 - nls? ( !<sys-devel/gdb-7.10-r1[nls] )" +" S="${WORKDIR}/${MY_P}" @@ -42,9 +38,16 @@ MULTILIB_WRAPPED_HEADERS=( src_prepare() { if [[ ! -z ${PATCH_VER} ]] ; then + # Use upstream patch to enable development mode + rm -v "${WORKDIR}/patch"/0000-Gentoo-Git-is-development.patch || die + einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}" eapply "${WORKDIR}/patch"/*.patch fi + + # Fix cross-compile relinking issue, bug #626402 + elibtoolize + default } @@ -83,7 +86,7 @@ multilib_src_configure() { # We pull in all USE-flags that change ABI in an incompatible # way. #666100 # USE=multitarget change size of global arrays - # USE=64-bit-bfd changes data structures of exported API + # USE=64-bit-bfd changes data structures of exported API --with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)-$(usex 64-bit-bfd 64 def) ) @@ -100,6 +103,12 @@ multilib_src_configure() { ECONF_SOURCE=${S} \ econf "${myconf[@]}" + + # Prevent makeinfo from running as we don't build docs here. + # bug #622652 + sed -i \ + -e '/^MAKEINFO/s:=.*:= true:' \ + Makefile || die } multilib_src_install() { |