mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-17 01:46:58 +02:00
Merge pull request #191 from flatcar-linux/sayan/update-binutils-2.37
sys-{devel,libs}/binutils{,-libs}: Sync with Gentoo upstream; updates to 2.37
This commit is contained in:
Sayan Chowdhury
GitHub
commit
bce773df5e
@ -1,4 +1,3 @@
|
||||
DIST binutils-2.32-patches-2.tar.xz 145672 BLAKE2B 8218e621f99cb4bcd1638c3011449b94480d207eaeb79cf75c0072e0f1a86bfd1603fc4515bc40d3ac1921a18b9a211b20568f59b11b13eb44e6cff1329c5af9 SHA512 55c25a603f6175af3ade6848e5c1faba06a147d72e9a4f53d44502d97db76499485a67b278a654d18884714a7bf7b360c77c9e42dba3cdc188f805bfe461f09f
|
||||
DIST binutils-2.32-patches-3.tar.xz 151372 BLAKE2B 70d5f78d9f3e3bf9ff096b6f24babcc35c63395a5e1155a981a5ceb4b7a5706ad2ee0c77c74e910fc0eefeaed19763113186deb9665eed538dc3b8e227bef12d SHA512 5e91eff63332c2aca86a82a287ca4959a6098065ed88078265a3d79a2c851abd113e9736b75d8102a208996ed1191b0e23569921217ece975f1d9005a55afd0d
|
||||
DIST binutils-2.32.tar.xz 20774880 BLAKE2B d1bdbd9c8487c091665c197974ce4bdf520b7a67ed6997a81b87e6a0af9514a091458244f583acec5ae580ac2ee5e908f67f483b8e5263cd18ced794cb235da6 SHA512 d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a
|
||||
DIST binutils-2.33.1-patches-2.tar.xz 18636 BLAKE2B 0e0757329b6a83aeff4f4c450c95e73fd48fcc89f83e63f294568632bee0972552cf2f57494352c5d9a7c16a51cdbc4108b38fa6028d4388c8e76046b3da9212 SHA512 d982f68d1f5fdb384309a2a1b7426bf840a90e7a85b37229b4223b62c36cab9dd9ec0c08382c85c68adf996dec21133df3180a2fc649363adae8645f8282f71d
|
||||
@ -7,5 +6,7 @@ DIST binutils-2.34-patches-6.tar.xz 103028 BLAKE2B d0e866d0941d2b550c7d7f23530c6
|
||||
DIST binutils-2.34.tar.xz 21637796 BLAKE2B 07dd23916a7d27f71c3f160c8c16abe2bd4fce294c738c665a012a3be6a87dbe8160d0c38740524f9025e01d438e99b2a94bcf9f9f79ee214f5dd033de8aad3d SHA512 2c7976939dcf5e8c5b7374cccd39bfe803b1bec73c6abfa0eb17c24e1942574c6bdb874c66a092a82adc443182eacd8a5a8001c19a76101f0c7ba40c27de0bbd
|
||||
DIST binutils-2.35.2-patches-1.tar.xz 11836 BLAKE2B 0141349c9618992d1ab1e0309f7ed8fbc43b60a58be1dfed05eae8a8fee857241d9e112ae673da6fc9778767675f536ece818cb85567367bb1c8f87a0693623f SHA512 35de5f227c745c5fb800784fe657b2a6216faf43e2498e8481e7b0dc79b0d2f86b3b6a10b896e060319a77a51c61d2e1b7a951ae962b3a6ef8c1a2a261d9bb6c
|
||||
DIST binutils-2.35.2.tar.xz 22056908 BLAKE2B 9c392e0db2b482442f9476f30bd80cf2796321cbf7be79cf21af7bef167b6074c4ae009dcf9b438d2f2f4a23381c935176b2cfa85de1a526ab46e0fd844a7ca5 SHA512 9974ede5978d32e0d68fef23da48fa00bd06b0bff7ec45b00ca075c126d6bbe0cf2defc03ecc3f17bc6cc85b64271a13009c4049d7ba17de26e84e3a6e2c0348
|
||||
DIST binutils-2.36.1-patches-3.tar.xz 32720 BLAKE2B 2a5a60168ec5ff612e7e58530092f306460cdb4a963320978dffcc22d73684486a14a5981f6eab2f7fc270def22cdc9954de455d680b2de4befc1ad4916347ba SHA512 e429cc82451675f14715d4e7640fe7b995495c8759a8e919c4291f8ca8358a663012f05c1ec6e60b1261114848379fefc9df723929770462dd676fa04fc7aa54
|
||||
DIST binutils-2.36.1-patches-5.tar.xz 44388 BLAKE2B 1dadb012fe35ec5fb0c5a15d348ab535bc5e3765375c97a3768c6b9f7126e0fda15d35163c9f9c33a4be98662dd120d7c1b21930a20c18dbb5345f56ecd9ecc1 SHA512 a2ce3388f1f1a77ff865481ff4b625121fd55f5234fed0a885312744f2f9c504717de1499b68252c6de64fa45866db7692df91c5838b43fbeb178938811cbe84
|
||||
DIST binutils-2.36.1.tar.xz 22772248 BLAKE2B 03fbfbedd6dba2beaa836b1ed254eddd7a54a163d3061fd93edd2b9591cae24ba049b26658c524b5ccecc2f22d431dfa168218d2531aa356945c994fbbe896fa SHA512 cc24590bcead10b90763386b6f96bb027d7594c659c2d95174a6352e8b98465a50ec3e4088d0da038428abe059bbc4ae5f37b269f31a40fc048072c8a234f4e9
|
||||
DIST binutils-2.37_p1-patches-0.tar.xz 1392 BLAKE2B 128930a381022fea5d1fcb0695953e8dada2513b088b8540fe08d4e0da93ec18b6bf9c78acad6ec5a8982ae2c115d143462ef0bb7bfd63cfeb06c10ad472c2f8 SHA512 44666821f96349e96685ffcfd53a80a94659e38fc63eeeb980d0eed13aab03ae3e2d5059b4932cd9018f2f7698cdb5e15b443d60c01b2bd1385eeb0c698e0e24
|
||||
DIST binutils-2.37_p1.tar.xz 22992196 BLAKE2B a8aa0f386d03a5b1466166ac7c40989c228351ccf0949a9b462b4d4615d70ab7e1a45351299140a42baf39c317b8007733c253eb547ee1dfadb612addde11621 SHA512 46c297ec2a7a5b81d1c6e3f16486a6dc2860a07520fe2dd8871d1eb5160065bbe2cc6b0415d5352bf12284133e5817a4e429e6077182d615e969bd1a8f52ed28
|
||||
|
||||
@ -32,7 +32,7 @@ else
|
||||
[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
|
||||
https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
|
||||
SLOT=$(ver_cut 1-2)
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
|
||||
fi
|
||||
|
||||
#
|
||||
@ -67,7 +67,10 @@ BDEPEND="
|
||||
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
PATCHES=("${FILESDIR}"/${PN}-2.35.1-cet.patch)
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-2.35.1-cet.patch
|
||||
"${FILESDIR}"/${PN}-2.35.2-powerpc-tests.patch
|
||||
)
|
||||
|
||||
MY_BUILDDIR=${WORKDIR}/build
|
||||
|
||||
|
||||
@ -19,7 +19,7 @@ REQUIRED_USE="default-gold? ( gold )"
|
||||
# PATCH_DEV - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
|
||||
# for the patchsets
|
||||
|
||||
PATCH_VER=3
|
||||
PATCH_VER=5
|
||||
PATCH_DEV=dilfridge
|
||||
|
||||
if [[ ${PV} == 9999* ]]; then
|
||||
@ -32,7 +32,7 @@ else
|
||||
[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
|
||||
https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
|
||||
SLOT=$(ver_cut 1-2)
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
|
||||
fi
|
||||
|
||||
#
|
||||
@ -1,56 +1,40 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
EAPI=7
|
||||
|
||||
inherit eutils libtool flag-o-matic gnuconfig multilib toolchain-funcs versionator
|
||||
inherit eutils libtool flag-o-matic gnuconfig multilib toolchain-funcs
|
||||
|
||||
DESCRIPTION="Tools necessary to build programs"
|
||||
HOMEPAGE="https://sourceware.org/binutils/"
|
||||
LICENSE="GPL-3+"
|
||||
# USE="+cxx" is a transitional flag until llvm migrates to new flags:
|
||||
# bug #677888
|
||||
IUSE="+cxx default-gold doc +gold multitarget +nls +plugins static-libs test"
|
||||
REQUIRED_USE="cxx? ( gold plugins ) default-gold? ( gold )"
|
||||
IUSE="cet default-gold doc +gold multitarget +nls +plugins static-libs test vanilla"
|
||||
REQUIRED_USE="default-gold? ( gold )"
|
||||
|
||||
# Variables that can be set here:
|
||||
# Variables that can be set here (ignored for live ebuilds)
|
||||
# PATCH_VER - the patchset version
|
||||
# Default: empty, no patching
|
||||
# PATCH_BINUTILS_VER - the binutils version in the patchset name
|
||||
# - Default: PV
|
||||
# PATCH_DEV - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
|
||||
# for the patchsets
|
||||
# Default: dilfridge :)
|
||||
|
||||
PATCH_VER=2
|
||||
PATCH_VER=0
|
||||
PATCH_DEV=dilfridge
|
||||
|
||||
case ${PV} in
|
||||
9999)
|
||||
EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
|
||||
inherit git-r3
|
||||
S=${WORKDIR}/binutils
|
||||
EGIT_CHECKOUT_DIR=${S}
|
||||
SLOT=${PV}
|
||||
;;
|
||||
*)
|
||||
SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
|
||||
SLOT=$(get_version_component_range 1-2)
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
|
||||
;;
|
||||
esac
|
||||
|
||||
#
|
||||
# The Gentoo patchset
|
||||
#
|
||||
PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
|
||||
PATCH_DEV=${PATCH_DEV:-slyfox}
|
||||
|
||||
[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
|
||||
https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
|
||||
|
||||
# Disable gold testsuite since it always fails.
|
||||
PATCHES=( "${FILESDIR}/${PN}-2.29.1-nogoldtest.patch" )
|
||||
if [[ ${PV} == 9999* ]]; then
|
||||
inherit git-r3
|
||||
SLOT=${PV}
|
||||
else
|
||||
PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
|
||||
PATCH_DEV=${PATCH_DEV:-dilfridge}
|
||||
SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PV}.tar.xz"
|
||||
[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
|
||||
https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
|
||||
SLOT=$(ver_cut 1-2)
|
||||
# live ebuild
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
|
||||
fi
|
||||
|
||||
#
|
||||
# The cross-compile logic
|
||||
@ -70,9 +54,13 @@ RDEPEND="
|
||||
>=sys-devel/binutils-config-3
|
||||
sys-libs/zlib
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="
|
||||
doc? ( sys-apps/texinfo )
|
||||
test? ( dev-util/dejagnu )
|
||||
test? (
|
||||
dev-util/dejagnu
|
||||
sys-devel/bc
|
||||
)
|
||||
nls? ( sys-devel/gettext )
|
||||
sys-devel/flex
|
||||
virtual/yacc
|
||||
@ -83,24 +71,44 @@ RESTRICT="!test? ( test )"
|
||||
MY_BUILDDIR=${WORKDIR}/build
|
||||
|
||||
src_unpack() {
|
||||
case ${PV} in
|
||||
*9999)
|
||||
git-r3_src_unpack
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
esac
|
||||
default
|
||||
mkdir -p "${MY_BUILDDIR}"
|
||||
if [[ ${PV} == 9999* ]] ; then
|
||||
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/toolchain/binutils-patches.git"
|
||||
EGIT_CHECKOUT_DIR=${WORKDIR}/patches-git
|
||||
git-r3_src_unpack
|
||||
mv patches-git/9999 patch || die
|
||||
|
||||
EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
|
||||
S=${WORKDIR}/binutils
|
||||
EGIT_CHECKOUT_DIR=${S}
|
||||
git-r3_src_unpack
|
||||
else
|
||||
unpack ${P}.tar.xz
|
||||
|
||||
cd "${WORKDIR}" || die
|
||||
unpack binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz
|
||||
|
||||
# _p patch versions are Gentoo specific tarballs ...
|
||||
S=${WORKDIR}/${P%_p?}
|
||||
fi
|
||||
|
||||
cd "${WORKDIR}" || die
|
||||
mkdir -p "${MY_BUILDDIR}" || die
|
||||
}
|
||||
|
||||
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
|
||||
local patchsetname
|
||||
if [[ ${PV} == 9999* ]] ; then
|
||||
patchsetname="from git master"
|
||||
else
|
||||
patchsetname="${PATCH_BINUTILS_VER}-${PATCH_VER}"
|
||||
fi
|
||||
|
||||
einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
|
||||
eapply "${WORKDIR}/patch"/*.patch
|
||||
if [[ ! -z ${PATCH_VER} ]] || [[ ${PV} == 9999* ]] ; then
|
||||
if ! use vanilla; then
|
||||
einfo "Applying binutils patchset ${patchsetname}"
|
||||
eapply "${WORKDIR}/patch"
|
||||
einfo "Done."
|
||||
fi
|
||||
fi
|
||||
|
||||
# This check should probably go somewhere else, like pkg_pretend.
|
||||
@ -241,6 +249,10 @@ src_configure() {
|
||||
--enable-relro
|
||||
# Newer versions (>=2.24) make this an explicit option. #497268
|
||||
--enable-install-libiberty
|
||||
# Available from 2.35 on
|
||||
--enable-textrel-check=warning
|
||||
# Works better than vapier's patch... #808787
|
||||
--enable-new-dtags
|
||||
--disable-werror
|
||||
--with-bugurl="$(toolchain-binutils_bugurl)"
|
||||
--with-pkgversion="$(toolchain-binutils_pkgversion)"
|
||||
@ -254,6 +266,15 @@ src_configure() {
|
||||
# Change SONAME to avoid conflict across
|
||||
# {native,cross}/binutils, binutils-libs. #666100
|
||||
--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)
|
||||
|
||||
# avoid automagic dependency on (currently prefix) systems
|
||||
# systems with debuginfod library, bug #754753
|
||||
--without-debuginfod
|
||||
|
||||
# Allow user to opt into CET for host libraries.
|
||||
# Ideally we would like automagic-or-disabled here.
|
||||
# But the check does not quite work on i686: bug #760926.
|
||||
$(use_enable cet)
|
||||
)
|
||||
echo ./configure "${myconf[@]}"
|
||||
"${S}"/configure "${myconf[@]}" || die
|
||||
@ -287,8 +308,7 @@ src_test() {
|
||||
# bug 637066
|
||||
filter-flags -Wall -Wreturn-type
|
||||
|
||||
# enable verbose test run and result logging
|
||||
emake -k check RUNTESTFLAGS='-a -v' VERBOSE=1
|
||||
emake -k check
|
||||
}
|
||||
|
||||
src_install() {
|
||||
@ -27,8 +27,8 @@ if [[ ${PV} == 9999* ]]; then
|
||||
SLOT=${PV}
|
||||
else
|
||||
PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
|
||||
PATCH_DEV=${PATCH_DEV:-slyfox}
|
||||
SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
|
||||
PATCH_DEV=${PATCH_DEV:-dilfridge}
|
||||
SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PV}.tar.xz"
|
||||
[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
|
||||
https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
|
||||
SLOT=$(ver_cut 1-2)
|
||||
@ -86,6 +86,9 @@ src_unpack() {
|
||||
|
||||
cd "${WORKDIR}" || die
|
||||
unpack binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz
|
||||
|
||||
# _p patch versions are Gentoo specific tarballs ...
|
||||
S=${WORKDIR}/${P%_p?}
|
||||
fi
|
||||
|
||||
cd "${WORKDIR}" || die
|
||||
@ -248,6 +251,8 @@ src_configure() {
|
||||
--enable-install-libiberty
|
||||
# Available from 2.35 on
|
||||
--enable-textrel-check=warning
|
||||
# Works better than vapier's patch... #808787
|
||||
--enable-new-dtags
|
||||
--disable-werror
|
||||
--with-bugurl="$(toolchain-binutils_bugurl)"
|
||||
--with-pkgversion="$(toolchain-binutils_pkgversion)"
|
||||
|
||||
@ -0,0 +1,136 @@
|
||||
From: Alan Modra <amodra@gmail.com>
|
||||
Date: Mon, 16 Nov 2020 22:08:05 +0000 (+1030)
|
||||
Subject: PR26882, --enable-textrel-check=warning test failures on powerpc
|
||||
X-Git-Tag: binutils-2_36~578
|
||||
X-Git-Url: https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff_plain;h=7cc340055d3993a25ded914aef88f784f16d46bc;hp=6f2643dbd2192e6fff77a5e6fec5141d209fd7d0
|
||||
|
||||
PR26882, --enable-textrel-check=warning test failures on powerpc
|
||||
|
||||
PR 26882
|
||||
* testsuite/ld-powerpc/dotsym3.d: Add "-z notext" to ld options.
|
||||
* testsuite/ld-powerpc/dotsym4.d: Likewise.
|
||||
* testsuite/ld-powerpc/ppc476-shared.d: Likewise.
|
||||
* testsuite/ld-powerpc/ppc476-shared2.d: Likewise.
|
||||
* testsuite/ld-powerpc/powerpc.exp: Likewise for various tests.
|
||||
* testsuite/ld-undefined/weak-fundef.s: Add BLPLT variant.
|
||||
* testsuite/ld-undefined/weak-undef.exp: Define BLPLT for ppc32.
|
||||
---
|
||||
|
||||
diff --git a/ld/testsuite/ld-powerpc/dotsym3.d b/ld/testsuite/ld-powerpc/dotsym3.d
|
||||
index fac2f8ec732..215a9c2a6c1 100644
|
||||
--- a/ld/testsuite/ld-powerpc/dotsym3.d
|
||||
+++ b/ld/testsuite/ld-powerpc/dotsym3.d
|
||||
@@ -1,7 +1,7 @@
|
||||
#source: nodotsym.s
|
||||
#source: dotsymref.s
|
||||
#as: -a64
|
||||
-#ld: -melf64ppc -Ttext=0x1000 -shared
|
||||
+#ld: -melf64ppc -Ttext=0x1000 -shared -z notext
|
||||
#objdump: -dR
|
||||
|
||||
.*: file format .*
|
||||
diff --git a/ld/testsuite/ld-powerpc/dotsym4.d b/ld/testsuite/ld-powerpc/dotsym4.d
|
||||
index fdd92f3da76..d774e83bcf6 100644
|
||||
--- a/ld/testsuite/ld-powerpc/dotsym4.d
|
||||
+++ b/ld/testsuite/ld-powerpc/dotsym4.d
|
||||
@@ -1,7 +1,7 @@
|
||||
#source: dotsymref.s
|
||||
#source: nodotsym.s
|
||||
#as: -a64
|
||||
-#ld: -melf64ppc -Ttext=0x1000 -shared
|
||||
+#ld: -melf64ppc -Ttext=0x1000 -shared -z notext
|
||||
#objdump: -dR
|
||||
|
||||
.*: file format .*
|
||||
diff --git a/ld/testsuite/ld-powerpc/powerpc.exp b/ld/testsuite/ld-powerpc/powerpc.exp
|
||||
index 74af28d7421..2cbefb841c2 100644
|
||||
--- a/ld/testsuite/ld-powerpc/powerpc.exp
|
||||
+++ b/ld/testsuite/ld-powerpc/powerpc.exp
|
||||
@@ -99,7 +99,7 @@ proc supports_ppc64 { } {
|
||||
# readelf: Apply readelf options on result. Compare with regex (last arg).
|
||||
|
||||
set ppcelftests {
|
||||
- {"Reloc section order" "-melf32ppc -shared -z nocombreloc" "" "-a32" {reloc.s}
|
||||
+ {"Reloc section order" "-melf32ppc -shared -z nocombreloc -z notext" "" "-a32" {reloc.s}
|
||||
{{objdump -hw reloc.d}} "reloc.so"}
|
||||
{"APUinfo section processing" "-melf32ppc" ""
|
||||
"-a32 -me500" {apuinfo1.s apuinfo-nul.s apuinfo2.s}
|
||||
@@ -134,7 +134,7 @@ set ppcelftests {
|
||||
{{readelf -WSsrl tlsexe32no.r} {objdump -dr tlsexe32no.d}
|
||||
{objdump -sj.got tlsexe32no.g} {objdump -sj.tdata tlsexe32.t}}
|
||||
"tlsexe32no"}
|
||||
- {"TLS32 shared" "-shared -melf32ppc --no-plt-align --no-ld-generated-unwind-info --hash-style=sysv tmpdir/tls32.o" "" "" {}
|
||||
+ {"TLS32 shared" "-shared -melf32ppc --no-plt-align --no-ld-generated-unwind-info --hash-style=sysv -z notext tmpdir/tls32.o" "" "" {}
|
||||
{{readelf -WSsrl tlsso32.r} {objdump -dr tlsso32.d}
|
||||
{objdump -sj.got tlsso32.g} {objdump -sj.tdata tlsso32.t}}
|
||||
"tls32.so"}
|
||||
@@ -202,7 +202,7 @@ set ppc64elftests {
|
||||
{{readelf -WSsrl tlsexeno.r} {objdump -dr tlsexeno.d}
|
||||
{objdump -sj.got tlsexeno.g} {objdump -sj.tdata tlsexe.t}}
|
||||
"tlsexeno"}
|
||||
- {"TLS shared" "-shared -melf64ppc --no-plt-align --no-ld-generated-unwind-info --hash-style=sysv tmpdir/tls.o" "" "" {}
|
||||
+ {"TLS shared" "-shared -melf64ppc --no-plt-align --no-ld-generated-unwind-info --hash-style=sysv -z notext tmpdir/tls.o" "" "" {}
|
||||
{{readelf -WSsrl tlsso.r} {objdump -dr tlsso.d}
|
||||
{objdump -sj.got tlsso.g} {objdump -sj.tdata tlsso.t}}
|
||||
"tls.so"}
|
||||
@@ -229,7 +229,7 @@ set ppc64elftests {
|
||||
{{readelf -WSsrl tlsexetoc.r} {objdump -dr tlsexetocno.d}
|
||||
{objdump -sj.got tlsexetocno.g} {objdump -sj.tdata tlsexetoc.t}}
|
||||
"tlsexetocno"}
|
||||
- {"TLSTOC shared" "-shared -melf64ppc --no-plt-align --no-ld-generated-unwind-info --hash-style=sysv tmpdir/tlstoc.o" "" "" {}
|
||||
+ {"TLSTOC shared" "-shared -melf64ppc --no-plt-align --no-ld-generated-unwind-info --hash-style=sysv -z notext tmpdir/tlstoc.o" "" "" {}
|
||||
{{readelf -WSsrl tlstocso.r} {objdump -dr tlstocso.d}
|
||||
{objdump -sj.got tlstocso.g} {objdump -sj.tdata tlstocso.t}}
|
||||
"tlstoc.so"}
|
||||
diff --git a/ld/testsuite/ld-powerpc/ppc476-shared.d b/ld/testsuite/ld-powerpc/ppc476-shared.d
|
||||
index 7953cb44e25..3b2cc8a155c 100644
|
||||
--- a/ld/testsuite/ld-powerpc/ppc476-shared.d
|
||||
+++ b/ld/testsuite/ld-powerpc/ppc476-shared.d
|
||||
@@ -1,6 +1,6 @@
|
||||
#source: ppc476-shared.s
|
||||
#as: -a32
|
||||
-#ld: -melf32ppc -q -shared -z common-page-size=0x10000 --ppc476-workaround -T ppc476-shared.lnk
|
||||
+#ld: -melf32ppc -q -shared -z common-page-size=0x10000 -z notext --ppc476-workaround -T ppc476-shared.lnk
|
||||
#objdump: -dr
|
||||
#target: powerpc*-*-*
|
||||
|
||||
diff --git a/ld/testsuite/ld-powerpc/ppc476-shared2.d b/ld/testsuite/ld-powerpc/ppc476-shared2.d
|
||||
index 26a5c41f988..48917fd4d92 100644
|
||||
--- a/ld/testsuite/ld-powerpc/ppc476-shared2.d
|
||||
+++ b/ld/testsuite/ld-powerpc/ppc476-shared2.d
|
||||
@@ -1,6 +1,6 @@
|
||||
#source: ppc476-shared.s
|
||||
#as: -a32
|
||||
-#ld: -melf32ppc -shared -z common-page-size=0x10000 --ppc476-workaround -T ppc476-shared.lnk
|
||||
+#ld: -melf32ppc -shared -z common-page-size=0x10000 -z notext --ppc476-workaround -T ppc476-shared.lnk
|
||||
#objdump: -R
|
||||
#target: powerpc*-*-*
|
||||
|
||||
diff --git a/ld/testsuite/ld-undefined/weak-fundef.s b/ld/testsuite/ld-undefined/weak-fundef.s
|
||||
index 2c20f799417..de8f641b6c2 100644
|
||||
--- a/ld/testsuite/ld-undefined/weak-fundef.s
|
||||
+++ b/ld/testsuite/ld-undefined/weak-fundef.s
|
||||
@@ -5,6 +5,9 @@
|
||||
bl undef_weak_fun
|
||||
nop
|
||||
.endif
|
||||
+ .ifdef BLPLT
|
||||
+ bl undef_weak_fun@plt
|
||||
+ .endif
|
||||
.ifdef CALLPLT
|
||||
call undef_weak_fun@plt
|
||||
.endif
|
||||
diff --git a/ld/testsuite/ld-undefined/weak-undef.exp b/ld/testsuite/ld-undefined/weak-undef.exp
|
||||
index 50c8e1483e3..14b6774c5bc 100644
|
||||
--- a/ld/testsuite/ld-undefined/weak-undef.exp
|
||||
+++ b/ld/testsuite/ld-undefined/weak-undef.exp
|
||||
@@ -105,7 +105,8 @@ set asflags ""
|
||||
switch -glob $target_triplet {
|
||||
aarch64* -
|
||||
arm* -
|
||||
- powerpc* { set asflags "--defsym BL=1" }
|
||||
+ powerpc64* { set asflags "--defsym BL=1" }
|
||||
+ powerpc* { set asflags "--defsym BLPLT=1" }
|
||||
hppa* { set asflags "--defsym HPPA=1" }
|
||||
i\[3-7\]86* -
|
||||
x86_64* { set asflags "--defsym CALLPLT=1" }
|
||||
@ -1,68 +0,0 @@
|
||||
https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=755ba58ebef02e1be9fc6770d00243ba6ed0223c
|
||||
https://bugs.gentoo.org/783777
|
||||
|
||||
From 755ba58ebef02e1be9fc6770d00243ba6ed0223c Mon Sep 17 00:00:00 2001
|
||||
From: Nick Alcock <nick.alcock@oracle.com>
|
||||
Date: Thu, 18 Mar 2021 12:37:52 +0000
|
||||
Subject: [PATCH] Add install dependencies for ld -> bfd and libctf -> bfd
|
||||
|
||||
This stops problems parallel-installing if a relink of libctf is needed.
|
||||
|
||||
Also adds corresponding install-strip dependencies.
|
||||
|
||||
ChangeLog
|
||||
2021-03-18 Nick Alcock <nick.alcock@oracle.com>
|
||||
|
||||
PR libctf/27482
|
||||
* Makefile.def: Add install-bfd dependencies for install-libctf and
|
||||
install-ld, and install-strip-bfd dependencies for
|
||||
install-strip-libctf and install-strip-ld; move the install-ld
|
||||
dependency on install-libctf to join it.
|
||||
* Makefile.in: Regenerated.
|
||||
---
|
||||
--- a/Makefile.def
|
||||
+++ b/Makefile.def
|
||||
@@ -448,7 +448,6 @@ dependencies = { module=all-binutils; on=all-intl; };
|
||||
dependencies = { module=all-binutils; on=all-gas; };
|
||||
dependencies = { module=all-binutils; on=all-libctf; };
|
||||
dependencies = { module=all-ld; on=all-libctf; };
|
||||
-dependencies = { module=install-ld; on=install-libctf; };
|
||||
|
||||
// We put install-opcodes before install-binutils because the installed
|
||||
// binutils might be on PATH, and they might need the shared opcodes
|
||||
@@ -456,6 +455,14 @@ dependencies = { module=install-ld; on=install-libctf; };
|
||||
dependencies = { module=install-binutils; on=install-opcodes; };
|
||||
dependencies = { module=install-strip-binutils; on=install-strip-opcodes; };
|
||||
|
||||
+// Likewise for ld, libctf, and bfd.
|
||||
+dependencies = { module=install-libctf; on=install-bfd; };
|
||||
+dependencies = { module=install-ld; on=install-bfd; };
|
||||
+dependencies = { module=install-ld; on=install-libctf; };
|
||||
+dependencies = { module=install-strip-libctf; on=install-strip-bfd; };
|
||||
+dependencies = { module=install-strip-ld; on=install-strip-bfd; };
|
||||
+dependencies = { module=install-strip-ld; on=install-strip-libctf; };
|
||||
+
|
||||
// libopcodes depends on libbfd
|
||||
dependencies = { module=install-opcodes; on=install-bfd; };
|
||||
dependencies = { module=install-strip-opcodes; on=install-strip-bfd; };
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -52170,9 +52170,14 @@ all-stage3-ld: maybe-all-stage3-libctf
|
||||
all-stage4-ld: maybe-all-stage4-libctf
|
||||
all-stageprofile-ld: maybe-all-stageprofile-libctf
|
||||
all-stagefeedback-ld: maybe-all-stagefeedback-libctf
|
||||
-install-ld: maybe-install-libctf
|
||||
install-binutils: maybe-install-opcodes
|
||||
install-strip-binutils: maybe-install-strip-opcodes
|
||||
+install-libctf: maybe-install-bfd
|
||||
+install-ld: maybe-install-bfd
|
||||
+install-ld: maybe-install-libctf
|
||||
+install-strip-libctf: maybe-install-strip-bfd
|
||||
+install-strip-ld: maybe-install-strip-bfd
|
||||
+install-strip-ld: maybe-install-strip-libctf
|
||||
install-opcodes: maybe-install-bfd
|
||||
install-strip-opcodes: maybe-install-strip-bfd
|
||||
configure-gas: maybe-configure-intl
|
||||
--
|
||||
2.27.0
|
||||
|
||||
@ -1,48 +0,0 @@
|
||||
https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=f04ce15e831b691d7610dba284e266919e757b10
|
||||
https://bugs.gentoo.org/783777
|
||||
|
||||
From f04ce15e831b691d7610dba284e266919e757b10 Mon Sep 17 00:00:00 2001
|
||||
From: Nick Alcock <nick.alcock@oracle.com>
|
||||
Date: Tue, 26 Jan 2021 16:05:17 +0000
|
||||
Subject: [PATCH] ld: depend on libctf
|
||||
|
||||
Since ld may depend on libctf (if present), and libctf may be relinked
|
||||
by the installation process, libctf must be installed before ld is,
|
||||
or the relink may fail if it calls on symbols or symbol versions that do
|
||||
not exist in any libctf already present on the system. (If none is
|
||||
present, the copy in the build tree will be automatically used, but
|
||||
if one *is* present, it may take precedence and break things.)
|
||||
|
||||
(This is a maybe- dependency, so it will work even if libctf is
|
||||
disabled.)
|
||||
|
||||
ChangeLog
|
||||
2021-01-26 Nick Alcock <nick.alcock@oracle.com>
|
||||
|
||||
PR 27250
|
||||
* Makefile.def: Add install-libctf dependency to install-ld.
|
||||
* Makefile.in: Regenerated.
|
||||
---
|
||||
--- a/Makefile.def
|
||||
+++ b/Makefile.def
|
||||
@@ -448,6 +448,7 @@ dependencies = { module=all-binutils; on=all-intl; };
|
||||
dependencies = { module=all-binutils; on=all-gas; };
|
||||
dependencies = { module=all-binutils; on=all-libctf; };
|
||||
dependencies = { module=all-ld; on=all-libctf; };
|
||||
+dependencies = { module=install-ld; on=install-libctf; };
|
||||
|
||||
// We put install-opcodes before install-binutils because the installed
|
||||
// binutils might be on PATH, and they might need the shared opcodes
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -52170,6 +52170,7 @@ all-stage3-ld: maybe-all-stage3-libctf
|
||||
all-stage4-ld: maybe-all-stage4-libctf
|
||||
all-stageprofile-ld: maybe-all-stageprofile-libctf
|
||||
all-stagefeedback-ld: maybe-all-stagefeedback-libctf
|
||||
+install-ld: maybe-install-libctf
|
||||
install-binutils: maybe-install-opcodes
|
||||
install-strip-binutils: maybe-install-strip-opcodes
|
||||
install-opcodes: maybe-install-bfd
|
||||
--
|
||||
2.27.0
|
||||
|
||||
@ -2,5 +2,7 @@ DIST binutils-2.34-patches-6.tar.xz 103028 BLAKE2B d0e866d0941d2b550c7d7f23530c6
|
||||
DIST binutils-2.34.tar.xz 21637796 BLAKE2B 07dd23916a7d27f71c3f160c8c16abe2bd4fce294c738c665a012a3be6a87dbe8160d0c38740524f9025e01d438e99b2a94bcf9f9f79ee214f5dd033de8aad3d SHA512 2c7976939dcf5e8c5b7374cccd39bfe803b1bec73c6abfa0eb17c24e1942574c6bdb874c66a092a82adc443182eacd8a5a8001c19a76101f0c7ba40c27de0bbd
|
||||
DIST binutils-2.35.2-patches-1.tar.xz 11836 BLAKE2B 0141349c9618992d1ab1e0309f7ed8fbc43b60a58be1dfed05eae8a8fee857241d9e112ae673da6fc9778767675f536ece818cb85567367bb1c8f87a0693623f SHA512 35de5f227c745c5fb800784fe657b2a6216faf43e2498e8481e7b0dc79b0d2f86b3b6a10b896e060319a77a51c61d2e1b7a951ae962b3a6ef8c1a2a261d9bb6c
|
||||
DIST binutils-2.35.2.tar.xz 22056908 BLAKE2B 9c392e0db2b482442f9476f30bd80cf2796321cbf7be79cf21af7bef167b6074c4ae009dcf9b438d2f2f4a23381c935176b2cfa85de1a526ab46e0fd844a7ca5 SHA512 9974ede5978d32e0d68fef23da48fa00bd06b0bff7ec45b00ca075c126d6bbe0cf2defc03ecc3f17bc6cc85b64271a13009c4049d7ba17de26e84e3a6e2c0348
|
||||
DIST binutils-2.36.1-patches-3.tar.xz 32720 BLAKE2B 2a5a60168ec5ff612e7e58530092f306460cdb4a963320978dffcc22d73684486a14a5981f6eab2f7fc270def22cdc9954de455d680b2de4befc1ad4916347ba SHA512 e429cc82451675f14715d4e7640fe7b995495c8759a8e919c4291f8ca8358a663012f05c1ec6e60b1261114848379fefc9df723929770462dd676fa04fc7aa54
|
||||
DIST binutils-2.36.1-patches-5.tar.xz 44388 BLAKE2B 1dadb012fe35ec5fb0c5a15d348ab535bc5e3765375c97a3768c6b9f7126e0fda15d35163c9f9c33a4be98662dd120d7c1b21930a20c18dbb5345f56ecd9ecc1 SHA512 a2ce3388f1f1a77ff865481ff4b625121fd55f5234fed0a885312744f2f9c504717de1499b68252c6de64fa45866db7692df91c5838b43fbeb178938811cbe84
|
||||
DIST binutils-2.36.1.tar.xz 22772248 BLAKE2B 03fbfbedd6dba2beaa836b1ed254eddd7a54a163d3061fd93edd2b9591cae24ba049b26658c524b5ccecc2f22d431dfa168218d2531aa356945c994fbbe896fa SHA512 cc24590bcead10b90763386b6f96bb027d7594c659c2d95174a6352e8b98465a50ec3e4088d0da038428abe059bbc4ae5f37b269f31a40fc048072c8a234f4e9
|
||||
DIST binutils-2.37_p1-patches-0.tar.xz 1392 BLAKE2B 128930a381022fea5d1fcb0695953e8dada2513b088b8540fe08d4e0da93ec18b6bf9c78acad6ec5a8982ae2c115d143462ef0bb7bfd63cfeb06c10ad472c2f8 SHA512 44666821f96349e96685ffcfd53a80a94659e38fc63eeeb980d0eed13aab03ae3e2d5059b4932cd9018f2f7698cdb5e15b443d60c01b2bd1385eeb0c698e0e24
|
||||
DIST binutils-2.37_p1.tar.xz 22992196 BLAKE2B a8aa0f386d03a5b1466166ac7c40989c228351ccf0949a9b462b4d4615d70ab7e1a45351299140a42baf39c317b8007733c253eb547ee1dfadb612addde11621 SHA512 46c297ec2a7a5b81d1c6e3f16486a6dc2860a07520fe2dd8871d1eb5160065bbe2cc6b0415d5352bf12284133e5817a4e429e6077182d615e969bd1a8f52ed28
|
||||
|
||||
@ -21,7 +21,7 @@ SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz
|
||||
LICENSE="|| ( GPL-3 LGPL-3 )"
|
||||
SLOT="0/${PV}"
|
||||
IUSE="64-bit-bfd cet multitarget nls static-libs"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
|
||||
BDEPEND="nls? ( sys-devel/gettext )"
|
||||
DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
|
||||
|
||||
134
sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.36.1-r2.ebuild
vendored
Normal file
134
sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.36.1-r2.ebuild
vendored
Normal file
@ -0,0 +1,134 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PATCH_VER=5
|
||||
PATCH_DEV=dilfridge
|
||||
|
||||
inherit libtool toolchain-funcs multilib-minimal
|
||||
|
||||
MY_PN="binutils"
|
||||
MY_P="${MY_PN}-${PV}"
|
||||
PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
|
||||
PATCH_DEV=${PATCH_DEV:-slyfox}
|
||||
|
||||
DESCRIPTION="Core binutils libraries (libbfd, libopcodes, libiberty) for external packages"
|
||||
HOMEPAGE="https://sourceware.org/binutils/"
|
||||
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 )"
|
||||
SLOT="0/${PV}"
|
||||
IUSE="64-bit-bfd cet multitarget nls static-libs"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
|
||||
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="${DEPEND}
|
||||
>=sys-devel/binutils-config-5
|
||||
"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
MULTILIB_WRAPPED_HEADERS=(
|
||||
/usr/include/bfd.h
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
if [[ ! -z ${PATCH_VER} ]] ; then
|
||||
einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
|
||||
eapply "${WORKDIR}/patch"/*.patch
|
||||
fi
|
||||
|
||||
# Fix cross-compile relinking issue, bug #626402
|
||||
elibtoolize
|
||||
|
||||
default
|
||||
}
|
||||
|
||||
pkgversion() {
|
||||
printf "Gentoo ${PVR}"
|
||||
[[ -n ${PATCHVER} ]] && printf " p${PATCHVER}"
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local myconf=(
|
||||
--enable-obsolete
|
||||
--enable-shared
|
||||
--enable-threads
|
||||
# Newer versions (>=2.24) make this an explicit option. #497268
|
||||
--enable-install-libiberty
|
||||
--disable-werror
|
||||
--with-bugurl="https://bugs.gentoo.org/"
|
||||
--with-pkgversion="$(pkgversion)"
|
||||
$(use_enable static-libs static)
|
||||
# The binutils eclass enables this flag for all bi-arch builds,
|
||||
# but other tools often don't care about that support. Put it
|
||||
# beyond a flag if people really want it, but otherwise leave
|
||||
# it disabled as it can slow things down on 32bit arches. #438522
|
||||
$(use_enable 64-bit-bfd)
|
||||
# This only disables building in the zlib subdir.
|
||||
# For binutils itself, it'll use the system version. #591516
|
||||
--without-zlib
|
||||
--with-system-zlib
|
||||
# We only care about the libs, so disable programs. #528088
|
||||
--disable-{binutils,etc,ld,gas,gold,gprof}
|
||||
# Disable modules that are in a combined binutils/gdb tree. #490566
|
||||
--disable-{gdb,libdecnumber,readline,sim}
|
||||
# Strip out broken static link flags.
|
||||
# https://gcc.gnu.org/PR56750
|
||||
--without-stage1-ldflags
|
||||
# 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
|
||||
--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)-$(usex 64-bit-bfd 64 def)
|
||||
|
||||
# avoid automagic dependency on (currently prefix) systems
|
||||
# systems with debuginfod library, bug #754753
|
||||
--without-debuginfod
|
||||
|
||||
# Allow user to opt into CET for host libraries.
|
||||
# Ideally we would like automagic-or-disabled here.
|
||||
# But the check does not quite work on i686: bug #760926.
|
||||
$(use_enable cet)
|
||||
)
|
||||
|
||||
# mips can't do hash-style=gnu ...
|
||||
if [[ $(tc-arch) != mips ]] ; then
|
||||
myconf+=( --enable-default-hash-style=gnu )
|
||||
fi
|
||||
|
||||
use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
|
||||
|
||||
use nls \
|
||||
&& myconf+=( --without-included-gettext ) \
|
||||
|| myconf+=( --disable-nls )
|
||||
|
||||
if [[ ${CHOST} == *-darwin* ]] && use nls ; then
|
||||
# fix underlinking in opcodes
|
||||
sed -i -e 's/@SHARED_LDFLAGS@/@SHARED_LDFLAGS@ -lintl/' \
|
||||
"${S}"/opcodes/Makefile.in || die
|
||||
fi
|
||||
|
||||
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() {
|
||||
default
|
||||
# Provide libiberty.h directly.
|
||||
dosym libiberty/libiberty.h /usr/include/libiberty.h
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
use static-libs || find "${ED}"/usr -name '*.la' -delete
|
||||
}
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
EAPI=7
|
||||
|
||||
PATCH_VER=3
|
||||
PATCH_VER=0
|
||||
PATCH_DEV=dilfridge
|
||||
|
||||
inherit libtool toolchain-funcs multilib-minimal
|
||||
@ -11,15 +11,16 @@ inherit libtool toolchain-funcs multilib-minimal
|
||||
MY_PN="binutils"
|
||||
MY_P="${MY_PN}-${PV}"
|
||||
PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
|
||||
PATCH_DEV=${PATCH_DEV:-slyfox}
|
||||
PATCH_DEV=${PATCH_DEV:-dilfridge}
|
||||
|
||||
DESCRIPTION="Core binutils libraries (libbfd, libopcodes, libiberty) for external packages"
|
||||
HOMEPAGE="https://sourceware.org/binutils/"
|
||||
SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz
|
||||
https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${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 )"
|
||||
SLOT="0/${PV}"
|
||||
SLOT="0/${PV%_p?}"
|
||||
IUSE="64-bit-bfd cet multitarget nls static-libs"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
|
||||
@ -30,7 +31,7 @@ RDEPEND="${DEPEND}
|
||||
>=sys-devel/binutils-config-5
|
||||
"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
S="${WORKDIR}/${MY_P%_p?}"
|
||||
|
||||
MULTILIB_WRAPPED_HEADERS=(
|
||||
/usr/include/bfd.h
|
||||
@ -1,68 +0,0 @@
|
||||
https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=755ba58ebef02e1be9fc6770d00243ba6ed0223c
|
||||
https://bugs.gentoo.org/783777
|
||||
|
||||
From 755ba58ebef02e1be9fc6770d00243ba6ed0223c Mon Sep 17 00:00:00 2001
|
||||
From: Nick Alcock <nick.alcock@oracle.com>
|
||||
Date: Thu, 18 Mar 2021 12:37:52 +0000
|
||||
Subject: [PATCH] Add install dependencies for ld -> bfd and libctf -> bfd
|
||||
|
||||
This stops problems parallel-installing if a relink of libctf is needed.
|
||||
|
||||
Also adds corresponding install-strip dependencies.
|
||||
|
||||
ChangeLog
|
||||
2021-03-18 Nick Alcock <nick.alcock@oracle.com>
|
||||
|
||||
PR libctf/27482
|
||||
* Makefile.def: Add install-bfd dependencies for install-libctf and
|
||||
install-ld, and install-strip-bfd dependencies for
|
||||
install-strip-libctf and install-strip-ld; move the install-ld
|
||||
dependency on install-libctf to join it.
|
||||
* Makefile.in: Regenerated.
|
||||
---
|
||||
--- a/Makefile.def
|
||||
+++ b/Makefile.def
|
||||
@@ -448,7 +448,6 @@ dependencies = { module=all-binutils; on=all-intl; };
|
||||
dependencies = { module=all-binutils; on=all-gas; };
|
||||
dependencies = { module=all-binutils; on=all-libctf; };
|
||||
dependencies = { module=all-ld; on=all-libctf; };
|
||||
-dependencies = { module=install-ld; on=install-libctf; };
|
||||
|
||||
// We put install-opcodes before install-binutils because the installed
|
||||
// binutils might be on PATH, and they might need the shared opcodes
|
||||
@@ -456,6 +455,14 @@ dependencies = { module=install-ld; on=install-libctf; };
|
||||
dependencies = { module=install-binutils; on=install-opcodes; };
|
||||
dependencies = { module=install-strip-binutils; on=install-strip-opcodes; };
|
||||
|
||||
+// Likewise for ld, libctf, and bfd.
|
||||
+dependencies = { module=install-libctf; on=install-bfd; };
|
||||
+dependencies = { module=install-ld; on=install-bfd; };
|
||||
+dependencies = { module=install-ld; on=install-libctf; };
|
||||
+dependencies = { module=install-strip-libctf; on=install-strip-bfd; };
|
||||
+dependencies = { module=install-strip-ld; on=install-strip-bfd; };
|
||||
+dependencies = { module=install-strip-ld; on=install-strip-libctf; };
|
||||
+
|
||||
// libopcodes depends on libbfd
|
||||
dependencies = { module=install-opcodes; on=install-bfd; };
|
||||
dependencies = { module=install-strip-opcodes; on=install-strip-bfd; };
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -52170,9 +52170,14 @@ all-stage3-ld: maybe-all-stage3-libctf
|
||||
all-stage4-ld: maybe-all-stage4-libctf
|
||||
all-stageprofile-ld: maybe-all-stageprofile-libctf
|
||||
all-stagefeedback-ld: maybe-all-stagefeedback-libctf
|
||||
-install-ld: maybe-install-libctf
|
||||
install-binutils: maybe-install-opcodes
|
||||
install-strip-binutils: maybe-install-strip-opcodes
|
||||
+install-libctf: maybe-install-bfd
|
||||
+install-ld: maybe-install-bfd
|
||||
+install-ld: maybe-install-libctf
|
||||
+install-strip-libctf: maybe-install-strip-bfd
|
||||
+install-strip-ld: maybe-install-strip-bfd
|
||||
+install-strip-ld: maybe-install-strip-libctf
|
||||
install-opcodes: maybe-install-bfd
|
||||
install-strip-opcodes: maybe-install-strip-bfd
|
||||
configure-gas: maybe-configure-intl
|
||||
--
|
||||
2.27.0
|
||||
|
||||
@ -1,48 +0,0 @@
|
||||
https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=f04ce15e831b691d7610dba284e266919e757b10
|
||||
https://bugs.gentoo.org/783777
|
||||
|
||||
From f04ce15e831b691d7610dba284e266919e757b10 Mon Sep 17 00:00:00 2001
|
||||
From: Nick Alcock <nick.alcock@oracle.com>
|
||||
Date: Tue, 26 Jan 2021 16:05:17 +0000
|
||||
Subject: [PATCH] ld: depend on libctf
|
||||
|
||||
Since ld may depend on libctf (if present), and libctf may be relinked
|
||||
by the installation process, libctf must be installed before ld is,
|
||||
or the relink may fail if it calls on symbols or symbol versions that do
|
||||
not exist in any libctf already present on the system. (If none is
|
||||
present, the copy in the build tree will be automatically used, but
|
||||
if one *is* present, it may take precedence and break things.)
|
||||
|
||||
(This is a maybe- dependency, so it will work even if libctf is
|
||||
disabled.)
|
||||
|
||||
ChangeLog
|
||||
2021-01-26 Nick Alcock <nick.alcock@oracle.com>
|
||||
|
||||
PR 27250
|
||||
* Makefile.def: Add install-libctf dependency to install-ld.
|
||||
* Makefile.in: Regenerated.
|
||||
---
|
||||
--- a/Makefile.def
|
||||
+++ b/Makefile.def
|
||||
@@ -448,6 +448,7 @@ dependencies = { module=all-binutils; on=all-intl; };
|
||||
dependencies = { module=all-binutils; on=all-gas; };
|
||||
dependencies = { module=all-binutils; on=all-libctf; };
|
||||
dependencies = { module=all-ld; on=all-libctf; };
|
||||
+dependencies = { module=install-ld; on=install-libctf; };
|
||||
|
||||
// We put install-opcodes before install-binutils because the installed
|
||||
// binutils might be on PATH, and they might need the shared opcodes
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -52170,6 +52170,7 @@ all-stage3-ld: maybe-all-stage3-libctf
|
||||
all-stage4-ld: maybe-all-stage4-libctf
|
||||
all-stageprofile-ld: maybe-all-stageprofile-libctf
|
||||
all-stagefeedback-ld: maybe-all-stagefeedback-libctf
|
||||
+install-ld: maybe-install-libctf
|
||||
install-binutils: maybe-install-opcodes
|
||||
install-strip-binutils: maybe-install-strip-opcodes
|
||||
install-opcodes: maybe-install-bfd
|
||||
--
|
||||
2.27.0
|
||||
|
||||
Loading…
Reference in New Issue
Block a user