1 |
commit: abfa31f3d0796c3f7c9f8da123596173c4d78c2e |
2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jun 22 18:08:34 2018 +0000 |
4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jun 22 18:21:46 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abfa31f3 |
7 |
|
8 |
sys-devel/binutils: Use 9999 instead of git as live designator, add patchset |
9 |
|
10 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
11 |
|
12 |
sys-devel/binutils/Manifest | 1 + |
13 |
sys-devel/binutils/binutils-9999.ebuild | 37 +++++++++++++++++---------------- |
14 |
2 files changed, 20 insertions(+), 18 deletions(-) |
15 |
|
16 |
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest |
17 |
index 68339b6c103..de8b3b1b3d3 100644 |
18 |
--- a/sys-devel/binutils/Manifest |
19 |
+++ b/sys-devel/binutils/Manifest |
20 |
@@ -11,3 +11,4 @@ DIST binutils-2.29.1.tar.bz2 29123355 BLAKE2B 83de518a27bae0f13c57b1979493dd7f7c |
21 |
DIST binutils-2.30-patches-2.tar.xz 490272 BLAKE2B a28a5b5bb8faa33fec269f2c69d6ed0e4e7d5a9169861aa4b3c45511794e1e749c216862a8258c2029f1b40c511dcb2a0aeaecda57e75d52418f10d6f345718f SHA512 1686d5b58ee968f2000647acab2bee4c263d1c85fd43fed8c820fccfc0d7024a01211e7853cd5ce452fa90da500bc17309edf6dbc901c7fd6fc7b3e3d6f42581 |
22 |
DIST binutils-2.30-patches-3.tar.xz 548804 BLAKE2B 428a1750233ae3f019e20cb5ed1d8e6fe6455181e8f5961dbfe7b66493d1c42050f889e45c02c1fc1a84d545c9e61f81ad6ffd5afc0b1099a702ccc7637c3abe SHA512 c91e902d1d9fc2e9782df04c93173c3207c771f1c063e2ff12c9336593c954ea3f1b2474a8fc045927d72fe18f7401874059599d100c4a1fd152081f05913d03 |
23 |
DIST binutils-2.30.tar.xz 20286700 BLAKE2B 2dd5436a15a601011a1950e6082ec00082f5916fb82ce95ceab424fd8dc19f6daa7ac32a149f222ccdcc603354165cc206fde070eaa44fe2cc5e57486efc7868 SHA512 e747ea20d8d79fcd21b9d9f6695059caa7189d60f19256da398e34b789fea9a133c32b192e9693b5828d27683739b0198431bf8b3e39fb3b04884cf89d9aa839 |
24 |
+DIST binutils-9999-patches-1.tar.xz 10116 BLAKE2B 1ae970fd13ea1b94f554ed5b3fde4b6bdd90efcfc2488efc2f1465511279027c2e7f2a7371069afadb91bf833680a24e1a5df50d3169c9ee132c933b3c1fdba9 SHA512 a5d97d7070b876bf072db2a99a2876c239e03409849b9c93467bd3e70cd97c468110031a09e1c182c05d48004ec3e1651f44a1850b0275a385c3bae598cd98d7 |
25 |
|
26 |
diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-9999.ebuild |
27 |
index d7ba7c31aa7..c7972aa0b70 100644 |
28 |
--- a/sys-devel/binutils/binutils-9999.ebuild |
29 |
+++ b/sys-devel/binutils/binutils-9999.ebuild |
30 |
@@ -19,25 +19,25 @@ IUSE="+cxx doc multitarget +nls static-libs test" |
31 |
# for the patchsets |
32 |
# Default: dilfridge :) |
33 |
|
34 |
+PATCH_VER=1 |
35 |
+ |
36 |
case ${PV} in |
37 |
9999) |
38 |
- BVER="git" |
39 |
EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git" |
40 |
inherit git-r3 |
41 |
S=${WORKDIR}/binutils |
42 |
EGIT_CHECKOUT_DIR=${S} |
43 |
;; |
44 |
*) |
45 |
- BVER=${PV} |
46 |
- SRC_URI="mirror://gnu/binutils/binutils-${BVER}.tar.xz" |
47 |
+ SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz" |
48 |
;; |
49 |
esac |
50 |
-SLOT="${BVER}" |
51 |
+SLOT="${PV}" |
52 |
|
53 |
# |
54 |
# The Gentoo patchset |
55 |
# |
56 |
-PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${BVER}} |
57 |
+PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}} |
58 |
PATCH_DEV=${PATCH_DEV:-dilfridge} |
59 |
|
60 |
[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI} |
61 |
@@ -80,7 +80,8 @@ MY_BUILDDIR=${WORKDIR}/build |
62 |
src_unpack() { |
63 |
case ${PV} in |
64 |
9999) |
65 |
- git-r3_src_unpack; |
66 |
+ git-r3_src_unpack |
67 |
+ default |
68 |
;; |
69 |
*) |
70 |
default |
71 |
@@ -136,21 +137,21 @@ toolchain-binutils_bugurl() { |
72 |
printf "https://bugs.gentoo.org/" |
73 |
} |
74 |
toolchain-binutils_pkgversion() { |
75 |
- printf "Gentoo ${BVER}" |
76 |
+ printf "Gentoo ${PV}" |
77 |
[[ -n ${PATCH_VER} ]] && printf " p${PATCH_VER}" |
78 |
} |
79 |
|
80 |
src_configure() { |
81 |
# Setup some paths |
82 |
- LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${BVER} |
83 |
+ LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV} |
84 |
INCPATH=${LIBPATH}/include |
85 |
- DATAPATH=/usr/share/binutils-data/${CTARGET}/${BVER} |
86 |
+ DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV} |
87 |
if is_cross ; then |
88 |
TOOLPATH=/usr/${CHOST}/${CTARGET} |
89 |
else |
90 |
TOOLPATH=/usr/${CTARGET} |
91 |
fi |
92 |
- BINPATH=${TOOLPATH}/binutils-bin/${BVER} |
93 |
+ BINPATH=${TOOLPATH}/binutils-bin/${PV} |
94 |
|
95 |
# Make sure we filter $LINGUAS so that only ones that |
96 |
# actually work make it through #42033 |
97 |
@@ -282,7 +283,7 @@ src_install() { |
98 |
# Newer versions of binutils get fancy with ${LIBPATH} #171905 |
99 |
cd "${ED}"/${LIBPATH} |
100 |
for d in ../* ; do |
101 |
- [[ ${d} == ../${BVER} ]] && continue |
102 |
+ [[ ${d} == ../${PV} ]] && continue |
103 |
mv ${d}/* . || die |
104 |
rmdir ${d} || die |
105 |
done |
106 |
@@ -323,10 +324,10 @@ src_install() { |
107 |
insinto /etc/env.d/binutils |
108 |
cat <<-EOF > "${T}"/env.d |
109 |
TARGET="${CTARGET}" |
110 |
- VER="${BVER}" |
111 |
+ VER="${PV}" |
112 |
LIBPATH="${EPREFIX}${LIBPATH}" |
113 |
EOF |
114 |
- newins "${T}"/env.d ${CTARGET}-${BVER} |
115 |
+ newins "${T}"/env.d ${CTARGET}-${PV} |
116 |
|
117 |
# Handle documentation |
118 |
if ! is_cross ; then |
119 |
@@ -358,7 +359,7 @@ src_install() { |
120 |
pkg_postinst() { |
121 |
# Make sure this ${CTARGET} has a binutils version selected |
122 |
[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0 |
123 |
- binutils-config ${CTARGET}-${BVER} |
124 |
+ binutils-config ${CTARGET}-${PV} |
125 |
} |
126 |
|
127 |
pkg_postrm() { |
128 |
@@ -370,7 +371,7 @@ pkg_postrm() { |
129 |
# rerun binutils-config if this is a remerge, as |
130 |
# we want the mtimes on the symlinks updated (if |
131 |
# it is the same as the current selected profile) |
132 |
- if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${BVER} ]] ; then |
133 |
+ if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${PV} ]] ; then |
134 |
local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}') |
135 |
choice=${choice//$'\n'/ } |
136 |
choice=${choice/* } |
137 |
@@ -379,8 +380,8 @@ pkg_postrm() { |
138 |
else |
139 |
binutils-config ${choice} |
140 |
fi |
141 |
- elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${BVER} ]] ; then |
142 |
- binutils-config ${CTARGET}-${BVER} |
143 |
+ elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then |
144 |
+ binutils-config ${CTARGET}-${PV} |
145 |
fi |
146 |
} |
147 |
|
148 |
@@ -410,4 +411,4 @@ pkg_postrm() { |
149 |
# - at build-time set scriptdir to point to symlinked location: |
150 |
# ${TOOLPATH}: /usr/${CHOST} (or /usr/${CHOST}/${CTARGET} for cross-case) |
151 |
# - at install-time set scriptdir to point to slotted location: |
152 |
-# ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${BVER} |
153 |
+# ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${PV} |