vapier 14/11/08 17:12:09 Modified: toolchain-binutils.eclass Log: refactor bugurl/pkgversion info so ebuilds can override them easily
Revision Changes Path 1.137 eclass/toolchain-binutils.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain-binutils.eclass?rev=1.137&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain-binutils.eclass?rev=1.137&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain-binutils.eclass?r1=1.136&r2=1.137 Index: toolchain-binutils.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain-binutils.eclass,v retrieving revision 1.136 retrieving revision 1.137 diff -u -r1.136 -r1.137 --- toolchain-binutils.eclass 2 Nov 2014 19:36:36 -0000 1.136 +++ toolchain-binutils.eclass 8 Nov 2014 17:12:09 -0000 1.137 @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-binutils.eclass,v 1.136 2014/11/02 19:36:36 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-binutils.eclass,v 1.137 2014/11/08 17:12:09 vapier Exp $ # # Maintainer: Toolchain Ninjas <[email protected]> # @@ -220,6 +220,15 @@ has "${EAPI:-0}" 0 1 2 && ED=${D} EPREFIX= EROOT=${ROOT} } +# Intended for ebuilds to override to set their own versioning information. +toolchain-binutils_bugurl() { + printf "http://bugs.gentoo.org/"; +} +toolchain-binutils_pkgversion() { + printf "Gentoo ${BVER}" + [[ -n ${PATCHVER} ]] && printf " p${PATCHVER}" +} + toolchain-binutils_src_configure() { _eprefix_init @@ -281,8 +290,6 @@ has_version ">=${CATEGORY}/glibc-2.5" && myconf+=( --enable-secureplt ) has_version ">=sys-libs/glibc-2.5" && myconf+=( --enable-secureplt ) - local pkgver="Gentoo ${BVER}" - [[ -n ${PATCHVER} ]] && pkgver+=" p${PATCHVER}" myconf+=( --prefix="${EPREFIX}"/usr --host=${CHOST} @@ -300,8 +307,8 @@ # Newer versions (>=2.24) make this an explicit option. #497268 --enable-install-libiberty --disable-werror - --with-bugurl=http://bugs.gentoo.org/ - --with-pkgversion="${pkgver}" + --with-bugurl="$(toolchain-binutils_bugurl)" + --with-pkgversion="$(toolchain-binutils_pkgversion)" $(use_enable static-libs static) ${EXTRA_ECONF} # Disable modules that are in a combined binutils/gdb tree. #490566
