Gentoo Archives: gentoo-dev

From: "Marty E. Plummer" <hanetzer@×××××××××.com>
To: gentoo-dev@l.g.o
Cc: "Marty E. Plummer" <hanetzer@×××××××××.com>
Subject: [gentoo-dev] [PATCH 1/2] toolchain-binutils.eclass: drop git-2
Date: Sun, 03 Jun 2018 01:48:37
Message-Id: 20180603014716.17459-2-hanetzer@startmail.com
In Reply to: [gentoo-dev] [PATCH 0/2] drop git logic from toolchain eclasses by "Marty E. Plummer"
1 git-2.eclass is deprecated and the git logic is handled in the live
2 ebuild itself.
3 ---
4 eclass/toolchain-binutils.eclass | 16 +---------------
5 1 file changed, 1 insertion(+), 15 deletions(-)
6
7 diff --git a/eclass/toolchain-binutils.eclass b/eclass/toolchain-binutils.eclass
8 index 0e532a8f201..a504a0f9a4e 100644
9 --- a/eclass/toolchain-binutils.eclass
10 +++ b/eclass/toolchain-binutils.eclass
11 @@ -15,7 +15,6 @@ if [[ -n ${BINUTILS_TYPE} ]] ; then
12 BTYPE=${BINUTILS_TYPE}
13 else
14 case ${PV} in
15 - 9999) BTYPE="git";;
16 9999_pre*) BTYPE="snap";;
17 *.*.90) BTYPE="snap";;
18 *.*.*.*.*) BTYPE="hjlu";;
19 @@ -24,11 +23,6 @@ else
20 fi
21
22 case ${BTYPE} in
23 -git)
24 - BVER="git"
25 - EGIT_REPO_URI="git://sourceware.org/git/binutils-gdb.git"
26 - inherit git-2
27 - ;;
28 snap)
29 BVER=${PV/9999_pre}
30 ;;
31 @@ -58,7 +52,6 @@ DESCRIPTION="Tools necessary to build programs"
32 HOMEPAGE="https://sourceware.org/binutils/"
33
34 case ${BTYPE} in
35 - git) SRC_URI="" ;;
36 snap)
37 SRC_URI="ftp://gcc.gnu.org/pub/binutils/snapshots/binutils-${BVER}.tar.bz2
38 ftp://sourceware.org/pub/binutils/snapshots/binutils-${BVER}.tar.bz2" ;;
39 @@ -113,10 +106,6 @@ if is_cross ; then
40 fi
41
42 S=${WORKDIR}/binutils
43 -case ${BVER} in
44 -git) ;;
45 -*) S=${S}-${BVER} ;;
46 -esac
47
48 LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${BVER}
49 INCPATH=${LIBPATH}/include
50 @@ -129,10 +118,7 @@ else
51 fi
52
53 tc-binutils_unpack() {
54 - case ${BTYPE} in
55 - git) git-2_src_unpack ;;
56 - *) unpacker ${A} ;;
57 - esac
58 + unpacker ${A}
59 mkdir -p "${MY_BUILDDIR}"
60 [[ -d ${WORKDIR}/patch ]] && mkdir "${WORKDIR}"/patch/skip
61 }
62 --
63 2.17.1