diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-06-09 09:27:03 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-06-09 09:27:03 +0100 |
commit | cb3e8c6af7661fbcafdcacc7e0ecdfb610d098fa (patch) | |
tree | 047fc92023c520d07f13ec5ac96e094d1b312a7a /eclass/toolchain-binutils.eclass | |
parent | 7b9f15840068dfaeea5684f8a1af1fe460dfa14c (diff) |
gentoo resync : 09.06.2018
Diffstat (limited to 'eclass/toolchain-binutils.eclass')
-rw-r--r-- | eclass/toolchain-binutils.eclass | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/eclass/toolchain-binutils.eclass b/eclass/toolchain-binutils.eclass index 0e532a8f201e..552bba37c312 100644 --- a/eclass/toolchain-binutils.eclass +++ b/eclass/toolchain-binutils.eclass @@ -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";; @@ -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} ;; @@ -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" ;; @@ -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 @@ -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 } |