Skip to content

Commit

Permalink
toolchain-binutils.eclass: drop git-2
Browse files Browse the repository at this point in the history
git-2.eclass is deprecated and the git logic is handled in the live
ebuild itself.
  • Loading branch information
hanetzer authored and Sergei Trofimovich committed Jun 8, 2018
1 parent ba80152 commit 1358450
Showing 1 changed file with 2 additions and 16 deletions.
18 changes: 2 additions & 16 deletions eclass/toolchain-binutils.eclass
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ if [[ -n ${BINUTILS_TYPE} ]] ; then
BTYPE=${BINUTILS_TYPE}
else
case ${PV} in
9999) BTYPE="git";;
9999_pre*) BTYPE="snap";;
*.*.90) BTYPE="snap";;
*.*.*.*.*) BTYPE="hjlu";;
Expand All @@ -24,11 +23,6 @@ else
fi

case ${BTYPE} in
git)
BVER="git"
EGIT_REPO_URI="git://sourceware.org/git/binutils-gdb.git"
inherit git-2
;;
snap)
BVER=${PV/9999_pre}
;;
Expand Down Expand Up @@ -58,7 +52,6 @@ DESCRIPTION="Tools necessary to build programs"
HOMEPAGE="https://sourceware.org/binutils/"

case ${BTYPE} in
git) SRC_URI="" ;;
snap)
SRC_URI="ftp://gcc.gnu.org/pub/binutils/snapshots/binutils-${BVER}.tar.bz2
ftp://sourceware.org/pub/binutils/snapshots/binutils-${BVER}.tar.bz2" ;;
Expand Down Expand Up @@ -112,11 +105,7 @@ if is_cross ; then
DEPEND+=" >=sys-libs/binutils-libs-${PV}"
fi

S=${WORKDIR}/binutils
case ${BVER} in
git) ;;
*) S=${S}-${BVER} ;;
esac
S=${WORKDIR}/binutils-${BVER}

LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${BVER}
INCPATH=${LIBPATH}/include
Expand All @@ -129,10 +118,7 @@ else
fi

tc-binutils_unpack() {
case ${BTYPE} in
git) git-2_src_unpack ;;
*) unpacker ${A} ;;
esac
unpacker ${A}
mkdir -p "${MY_BUILDDIR}"
[[ -d ${WORKDIR}/patch ]] && mkdir "${WORKDIR}"/patch/skip
}
Expand Down

0 comments on commit 1358450

Please sign in to comment.