[gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
vapier 15/07/17 07:36:00 Modified: toolchain.eclass Log: use --enable-checking=no w/gcc-3.4 as release was not added until gcc-4.0 #551636 by Samuel Bauer Revision ChangesPath 1.676eclass/toolchain.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.676view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.676content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.675r2=1.676 Index: toolchain.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v retrieving revision 1.675 retrieving revision 1.676 diff -u -r1.675 -r1.676 --- toolchain.eclass1 Jun 2015 16:05:43 - 1.675 +++ toolchain.eclass17 Jul 2015 07:36:00 - 1.676 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.675 2015/06/01 16:05:43 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.676 2015/07/17 07:36:00 vapier Exp $ # Maintainer: Toolchain Ninjas toolch...@gentoo.org @@ -882,7 +882,9 @@ # Use the default (release) checking because upstream usually neglects # to test disabled so it has a history of breaking. #317217 if tc_version_is_at_least 3.4 ; then - confgcc+=( --enable-checking=${GCC_CHECKS_LIST:-$(usex debug yes release)} ) + # The release keyword is new to 4.0. #551636 + local off=$(tc_version_is_at_least 4.0 echo release || echo no) + confgcc+=( --enable-checking=${GCC_CHECKS_LIST:-$(usex debug yes ${off})} ) fi # Branding
[gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
vapier 15/06/01 07:04:04 Modified: toolchain.eclass Log: drop EAPI=0 EAPI=1 support Revision ChangesPath 1.673eclass/toolchain.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.673view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.673content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.672r2=1.673 Index: toolchain.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v retrieving revision 1.672 retrieving revision 1.673 diff -u -r1.672 -r1.673 --- toolchain.eclass27 May 2015 10:29:03 - 1.672 +++ toolchain.eclass1 Jun 2015 07:04:04 - 1.673 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.672 2015/05/27 10:29:03 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.673 2015/06/01 07:04:04 vapier Exp $ # Maintainer: Toolchain Ninjas toolch...@gentoo.org @@ -26,7 +26,7 @@ EXPORTED_FUNCTIONS=pkg_setup src_unpack src_compile src_test src_install pkg_postinst pkg_postrm case ${EAPI:-0} in - 0|1);; + 0|1)die Need to upgrade to at least EAPI=2;; 2|3)EXPORTED_FUNCTIONS+= src_prepare src_configure ;; 4*|5*) EXPORTED_FUNCTIONS+= pkg_pretend src_prepare src_configure ;; *) die I don't speak EAPI ${EAPI}. @@ -154,8 +154,7 @@ tc_version_is_at_least 4.9 IUSE+= cilk fi -[[ ${EAPI:-0} != 0 ]] IUSE_DEF=( ${IUSE_DEF[@]/#/+} ) -IUSE+= ${IUSE_DEF[*]} +IUSE+= ${IUSE_DEF[*]/#/+} # Support upgrade paths here or people get pissed if ! tc_version_is_at_least 4.7 || is_crosscompile || use multislot || [[ ${GCC_PV} == *_alpha* ]] ; then @@ -391,8 +390,8 @@ # pkg_setup toolchain_pkg_setup() { - case ${EAPI:-0} in - 0|1|2|3)toolchain_pkg_pretend ;; + case ${EAPI} in + 2|3) toolchain_pkg_pretend ;; esac # we dont want to use the installed compiler's specs to build gcc @@ -408,10 +407,6 @@ else gcc_quick_unpack fi - - case ${EAPI:-0} in - 0|1) toolchain_src_prepare ;; - esac } gcc_quick_unpack() { @@ -1498,10 +1493,6 @@ # src_compile toolchain_src_compile() { - case ${EAPI:-0} in - 0|1) toolchain_src_configure ;; - esac - touch ${S}/gcc/c-gperf.h # Do not make manpages if we do not have perl ...
[gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
vapier 15/06/01 07:17:40 Modified: toolchain.eclass Log: add USE=debug to control --enable-checking behavior for all versions rather than just snapshots Revision ChangesPath 1.674eclass/toolchain.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.674view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.674content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.673r2=1.674 Index: toolchain.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v retrieving revision 1.673 retrieving revision 1.674 diff -u -r1.673 -r1.674 --- toolchain.eclass1 Jun 2015 07:04:04 - 1.673 +++ toolchain.eclass1 Jun 2015 07:17:40 - 1.674 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.673 2015/06/01 07:04:04 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.674 2015/06/01 07:17:40 vapier Exp $ # Maintainer: Toolchain Ninjas toolch...@gentoo.org @@ -134,7 +134,7 @@ IUSE_DEF=( nls nptl ) if [[ ${PN} != kgcc64 ${PN} != gcc-* ]] ; then - IUSE+= altivec + IUSE+= altivec debug IUSE_DEF+=( cxx fortran ) [[ -n ${PIE_VER} ]] IUSE+= nopie [[ -n ${HTB_VER} ]] IUSE+= boundschecking @@ -880,10 +880,8 @@ # Use the default (release) checking because upstream usually neglects # to test disabled so it has a history of breaking. #317217 - if tc_version_is_at_least 4 || [[ -n ${GCC_CHECKS_LIST} ]] ; then - confgcc+=( --enable-checking=${GCC_CHECKS_LIST:-release} ) - else - confgcc+=( --disable-checking ) + if tc_version_is_at_least 3.4 ; then + confgcc+=( --enable-checking=${GCC_CHECKS_LIST:-$(usex debug yes release)} ) fi # Branding
[gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
vapier 15/06/01 16:05:44 Modified: toolchain.eclass Log: add USE=pie for gcc-6 to control enabling pie by default Revision ChangesPath 1.675eclass/toolchain.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.675view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.675content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.674r2=1.675 Index: toolchain.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v retrieving revision 1.674 retrieving revision 1.675 diff -u -r1.674 -r1.675 --- toolchain.eclass1 Jun 2015 07:17:40 - 1.674 +++ toolchain.eclass1 Jun 2015 16:05:43 - 1.675 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.674 2015/06/01 07:17:40 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.675 2015/06/01 16:05:43 vapier Exp $ # Maintainer: Toolchain Ninjas toolch...@gentoo.org @@ -152,6 +152,7 @@ # the older versions, we don't want to bother supporting it. #448024 tc_version_is_at_least 4.8 IUSE+= graphite IUSE_DEF+=( sanitize ) tc_version_is_at_least 4.9 IUSE+= cilk + tc_version_is_at_least 6.0 IUSE+= pie fi IUSE+= ${IUSE_DEF[*]/#/+} @@ -1193,6 +1194,10 @@ confgcc+=( $(use_enable sanitize libsanitizer) ) fi + if tc_version_is_at_least 6.0 ; then + confgcc+=( $(use_enable pie default-pie) ) + fi + # Disable gcc info regeneration -- it ships with generated info pages # already. Our custom version/urls/etc... trigger it. #464008 export gcc_cv_prog_makeinfo_modern=no
[gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
vapier 15/05/27 10:29:03 Modified: toolchain.eclass Log: when munging the libtool paths, make sure we use the internal multilib path and not the main libpath #540392 by Christoph Junghans Revision ChangesPath 1.672eclass/toolchain.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.672view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.672content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.671r2=1.672 Index: toolchain.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v retrieving revision 1.671 retrieving revision 1.672 diff -u -r1.671 -r1.672 --- toolchain.eclass26 May 2015 08:32:39 - 1.671 +++ toolchain.eclass27 May 2015 10:29:03 - 1.672 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.671 2015/05/26 08:32:39 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.672 2015/05/27 10:29:03 vapier Exp $ # Maintainer: Toolchain Ninjas toolch...@gentoo.org @@ -1818,9 +1818,11 @@ # -are-, and not where they -used- to be. also, any dependencies we have # on our own .la files need to be updated. fix_libtool_libdir_paths() { + local libpath=$1 + pushd ${D} /dev/null - pushd ./${1} /dev/null + pushd ./${libpath} /dev/null local dir=${PWD#${D%/}} local allarchives=$(echo *.la) allarchives=\(${allarchives// /\\|}\) @@ -1832,9 +1834,9 @@ # Would be nice to combine these, but -maxdepth can not be specified # on sub-expressions. find ./${PREFIX}/lib* -maxdepth 3 -name '*.la' \ - -exec sed -i -e /^dependency_libs=/s:/[^ ]*/${allarchives}:${LIBPATH}/\1:g {} + || die + -exec sed -i -e /^dependency_libs=/s:/[^ ]*/${allarchives}:${libpath}/\1:g {} + || die find ./${dir}/ -maxdepth 1 -name '*.la' \ - -exec sed -i -e /^dependency_libs=/s:/[^ ]*/${allarchives}:${LIBPATH}/\1:g {} + || die + -exec sed -i -e /^dependency_libs=/s:/[^ ]*/${allarchives}:${libpath}/\1:g {} + || die popd /dev/null }
[gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
vapier 15/05/26 08:32:39 Modified: toolchain.eclass Log: clean out generated Directory Reference man pages as they offer no real value #486754 Revision ChangesPath 1.671eclass/toolchain.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.671view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.671content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.670r2=1.671 Index: toolchain.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v retrieving revision 1.670 retrieving revision 1.671 diff -u -r1.670 -r1.671 --- toolchain.eclass25 May 2015 08:41:16 - 1.670 +++ toolchain.eclass26 May 2015 08:32:39 - 1.671 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.670 2015/05/25 08:41:16 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.671 2015/05/26 08:32:39 vapier Exp $ # Maintainer: Toolchain Ninjas toolch...@gentoo.org @@ -1576,6 +1576,13 @@ cd ${CTARGET}/libstdc++-v3 emake doxygen-man || ewarn failed to make docs fi + # Clean bogus manpages. #113902 + find -name '*_build_*' -delete + # Blow away generated directory references. Newer versions of gcc + # have gotten better at this, but not perfect. This is easier than + # backporting all of the various doxygen patches. #486754 + find -name '*_.3' -exec grep -l ' Directory Reference ' {} + | \ + xargs rm -f else ewarn Skipping libstdc++ manpage generation since you don't have doxygen installed fi @@ -1691,8 +1698,6 @@ if tc_version_is_at_least 3.0 ; then local cxx_mandir=$(find ${WORKDIR}/build/${CTARGET}/libstdc++-v3 -name man) if [[ -d ${cxx_mandir} ]] ; then - # clean bogus manpages #113902 - find ${cxx_mandir} -name '*_build_*' -exec rm {} \; cp -r ${cxx_mandir}/man? ${D}/${DATAPATH}/man/ fi fi
[gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass toolchain-binutils.eclass
vapier 15/05/25 08:41:16 Modified: toolchain.eclass toolchain-binutils.eclass Log: use slightly more readable version of CATEGORY/cross-* checking Revision ChangesPath 1.670eclass/toolchain.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.670view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.670content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.669r2=1.670 Index: toolchain.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v retrieving revision 1.669 retrieving revision 1.670 diff -u -r1.669 -r1.670 --- toolchain.eclass13 May 2015 09:12:57 - 1.669 +++ toolchain.eclass25 May 2015 08:41:16 - 1.670 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.669 2015/05/13 09:12:57 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.670 2015/05/25 08:41:16 vapier Exp $ # Maintainer: Toolchain Ninjas toolch...@gentoo.org @@ -37,8 +37,8 @@ export CTARGET=${CTARGET:-${CHOST}} if [[ ${CTARGET} = ${CHOST} ]] ; then - if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then - export CTARGET=${CATEGORY/cross-} + if [[ ${CATEGORY} == cross-* ]] ; then + export CTARGET=${CATEGORY#cross-} fi fi : ${TARGET_ABI:=${ABI}} 1.142eclass/toolchain-binutils.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain-binutils.eclass?rev=1.142view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain-binutils.eclass?rev=1.142content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain-binutils.eclass?r1=1.141r2=1.142 Index: toolchain-binutils.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain-binutils.eclass,v retrieving revision 1.141 retrieving revision 1.142 diff -u -r1.141 -r1.142 --- toolchain-binutils.eclass 25 May 2015 08:39:36 - 1.141 +++ toolchain-binutils.eclass 25 May 2015 08:41:16 - 1.142 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-binutils.eclass,v 1.141 2015/05/25 08:39:36 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-binutils.eclass,v 1.142 2015/05/25 08:41:16 vapier Exp $ # # Maintainer: Toolchain Ninjas toolch...@gentoo.org # @@ -49,8 +49,8 @@ export CTARGET=${CTARGET:-${CHOST}} if [[ ${CTARGET} == ${CHOST} ]] ; then - if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then - export CTARGET=${CATEGORY/cross-} + if [[ ${CATEGORY} == cross-* ]] ; then + export CTARGET=${CATEGORY#cross-} fi fi is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
[gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
vapier 15/05/13 09:12:57 Modified: toolchain.eclass Log: use find directly to run sed on la files so we skip sed when there are no la files #548782 Revision ChangesPath 1.669eclass/toolchain.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.669view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.669content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.668r2=1.669 Index: toolchain.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v retrieving revision 1.668 retrieving revision 1.669 diff -u -r1.668 -r1.669 --- toolchain.eclass11 May 2015 03:05:21 - 1.668 +++ toolchain.eclass13 May 2015 09:12:57 - 1.669 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.668 2015/05/11 03:05:21 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.669 2015/05/13 09:12:57 vapier Exp $ # Maintainer: Toolchain Ninjas toolch...@gentoo.org @@ -1824,10 +1824,12 @@ # The libdir might not have any .la files. #548782 find ./${dir} -maxdepth 1 -name '*.la' \ -exec sed -i -e /^libdir=/s:=.*:='${dir}': {} + || die - sed -i \ - -e /^dependency_libs=/s:/[^ ]*/${allarchives}:${LIBPATH}/\1:g \ - $(find ./${PREFIX}/lib* -maxdepth 3 -name '*.la') \ - $(find ./${dir}/ -maxdepth 1 -name '*.la') || die + # Would be nice to combine these, but -maxdepth can not be specified + # on sub-expressions. + find ./${PREFIX}/lib* -maxdepth 3 -name '*.la' \ + -exec sed -i -e /^dependency_libs=/s:/[^ ]*/${allarchives}:${LIBPATH}/\1:g {} + || die + find ./${dir}/ -maxdepth 1 -name '*.la' \ + -exec sed -i -e /^dependency_libs=/s:/[^ ]*/${allarchives}:${LIBPATH}/\1:g {} + || die popd /dev/null }
[gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
vapier 15/05/11 03:05:21 Modified: toolchain.eclass Log: use find to run sed on la files so we skip sed when there are no la files #548782 Revision ChangesPath 1.668eclass/toolchain.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.668view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.668content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.667r2=1.668 Index: toolchain.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v retrieving revision 1.667 retrieving revision 1.668 diff -u -r1.667 -r1.668 --- toolchain.eclass8 May 2015 11:21:02 - 1.667 +++ toolchain.eclass11 May 2015 03:05:21 - 1.668 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.667 2015/05/08 11:21:02 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.668 2015/05/11 03:05:21 vapier Exp $ # Maintainer: Toolchain Ninjas toolch...@gentoo.org @@ -1827,7 +1827,7 @@ sed -i \ -e /^dependency_libs=/s:/[^ ]*/${allarchives}:${LIBPATH}/\1:g \ $(find ./${PREFIX}/lib* -maxdepth 3 -name '*.la') \ - ./${dir}/*.la || die + $(find ./${dir}/ -maxdepth 1 -name '*.la') || die popd /dev/null }
[gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
vapier 15/05/08 11:21:02 Modified: toolchain.eclass Log: use find to run sed on la files so we skip sed when there are no la files #548782 Revision ChangesPath 1.667eclass/toolchain.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.667view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.667content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.666r2=1.667 Index: toolchain.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v retrieving revision 1.666 retrieving revision 1.667 diff -u -r1.666 -r1.667 --- toolchain.eclass4 May 2015 05:43:08 - 1.666 +++ toolchain.eclass8 May 2015 11:21:02 - 1.667 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.666 2015/05/04 05:43:08 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.667 2015/05/08 11:21:02 vapier Exp $ # Maintainer: Toolchain Ninjas toolch...@gentoo.org @@ -1821,9 +1821,9 @@ allarchives=\(${allarchives// /\\|}\) popd /dev/null - sed -i \ - -e /^libdir=/s:=.*:='${dir}': \ - ./${dir}/*.la || die + # The libdir might not have any .la files. #548782 + find ./${dir} -maxdepth 1 -name '*.la' \ + -exec sed -i -e /^libdir=/s:=.*:='${dir}': {} + || die sed -i \ -e /^dependency_libs=/s:/[^ ]*/${allarchives}:${LIBPATH}/\1:g \ $(find ./${PREFIX}/lib* -maxdepth 3 -name '*.la') \
[gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
vapier 15/05/04 05:43:08 Modified: toolchain.eclass Log: call die in more places to catch bad sed/mv commands Revision ChangesPath 1.666eclass/toolchain.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.666view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.666content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.665r2=1.666 Index: toolchain.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v retrieving revision 1.665 retrieving revision 1.666 diff -u -r1.665 -r1.666 --- toolchain.eclass23 Apr 2015 19:17:19 - 1.665 +++ toolchain.eclass4 May 2015 05:43:08 - 1.666 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.665 2015/04/23 19:17:19 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.666 2015/05/04 05:43:08 vapier Exp $ # Maintainer: Toolchain Ninjas toolch...@gentoo.org @@ -1784,7 +1784,7 @@ if [[ ${FROMDIR} != ${TODIR} -d ${FROMDIR} ]] ; then local files=$(find ${FROMDIR} -maxdepth 1 ! -type d 2/dev/null) if [[ -n ${files} ]] ; then - mv ${files} ${TODIR} + mv ${files} ${TODIR} || die fi fi done @@ -1794,7 +1794,7 @@ FROMDIR=${PREFIX}/lib/${OS_MULTIDIR} for x in ${D}${FROMDIR}/pkgconfig/libgcj*.pc ; do [[ -f ${x} ]] || continue - sed -i /^libdir=/s:=.*:=${LIBPATH}/${MULTIDIR}: ${x} + sed -i /^libdir=/s:=.*:=${LIBPATH}/${MULTIDIR}: ${x} || die mv ${x} ${D}${FROMDIR}/pkgconfig/libgcj-${GCC_PV}.pc || die done done @@ -1823,11 +1823,11 @@ sed -i \ -e /^libdir=/s:=.*:='${dir}': \ - ./${dir}/*.la + ./${dir}/*.la || die sed -i \ -e /^dependency_libs=/s:/[^ ]*/${allarchives}:${LIBPATH}/\1:g \ $(find ./${PREFIX}/lib* -maxdepth 3 -name '*.la') \ - ./${dir}/*.la + ./${dir}/*.la || die popd /dev/null }
[gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
vapier 15/04/23 19:17:19 Modified: toolchain.eclass Log: require newer isl w/gcc-5 to address a fortran ICE (gcc PR547470) #547470 Revision ChangesPath 1.665eclass/toolchain.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.665view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.665content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.664r2=1.665 Index: toolchain.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v retrieving revision 1.664 retrieving revision 1.665 diff -u -r1.664 -r1.665 --- toolchain.eclass20 Apr 2015 09:04:09 - 1.664 +++ toolchain.eclass23 Apr 2015 19:17:19 - 1.665 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.664 2015/04/20 09:04:09 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.665 2015/04/23 19:17:19 vapier Exp $ # Maintainer: Toolchain Ninjas toolch...@gentoo.org @@ -184,7 +184,7 @@ if in_iuse graphite ; then if tc_version_is_at_least 5.0 ; then - RDEPEND+= graphite? ( =dev-libs/isl-0.12 ) + RDEPEND+= graphite? ( =dev-libs/isl-0.14 ) elif tc_version_is_at_least 4.8 ; then RDEPEND+= graphite? (
[gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
vapier 15/04/20 09:00:20 Modified: toolchain.eclass Log: all sanitizer la files #546700 by Mihai Moldovan Revision ChangesPath 1.663eclass/toolchain.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.663view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.663content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.662r2=1.663 Index: toolchain.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v retrieving revision 1.662 retrieving revision 1.663 diff -u -r1.662 -r1.663 --- toolchain.eclass13 Apr 2015 04:16:35 - 1.662 +++ toolchain.eclass20 Apr 2015 09:00:20 - 1.663 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.662 2015/04/13 04:16:35 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.663 2015/04/20 09:00:20 vapier Exp $ # Maintainer: Toolchain Ninjas toolch...@gentoo.org @@ -1720,8 +1720,8 @@ insinto ${DATAPATH} if tc_version_is_at_least 4.0 ; then newins ${GCC_FILESDIR}/awk/fixlafiles.awk-no_gcc_la fixlafiles.awk || die - find ${D}/${LIBPATH} -name libstdc++.la -type f -exec rm {} \; - find ${D}/${LIBPATH} -name lib?san.la -type f -exec rm {} \; # 487550 + find ${D}/${LIBPATH} -name libstdc++.la -type f -delete + find ${D}/${LIBPATH} -name 'lib*san.la' -type f -delete #487550 #546700 else doins ${GCC_FILESDIR}/awk/fixlafiles.awk || die fi
[gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
vapier 15/04/20 09:04:09 Modified: toolchain.eclass Log: make linker script clean up behavior the same across old versions of gcc Revision ChangesPath 1.664eclass/toolchain.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.664view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.664content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.663r2=1.664 Index: toolchain.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v retrieving revision 1.663 retrieving revision 1.664 diff -u -r1.663 -r1.664 --- toolchain.eclass20 Apr 2015 09:00:20 - 1.663 +++ toolchain.eclass20 Apr 2015 09:04:09 - 1.664 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.663 2015/04/20 09:00:20 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.664 2015/04/20 09:04:09 vapier Exp $ # Maintainer: Toolchain Ninjas toolch...@gentoo.org @@ -1718,13 +1718,9 @@ # between binary and source package borks things if ! is_crosscompile ; then insinto ${DATAPATH} - if tc_version_is_at_least 4.0 ; then - newins ${GCC_FILESDIR}/awk/fixlafiles.awk-no_gcc_la fixlafiles.awk || die - find ${D}/${LIBPATH} -name libstdc++.la -type f -delete - find ${D}/${LIBPATH} -name 'lib*san.la' -type f -delete #487550 #546700 - else - doins ${GCC_FILESDIR}/awk/fixlafiles.awk || die - fi + newins ${GCC_FILESDIR}/awk/fixlafiles.awk-no_gcc_la fixlafiles.awk || die + find ${D}/${LIBPATH} -name libstdc++.la -type f -delete + find ${D}/${LIBPATH} -name 'lib*san.la' -type f -delete #487550 #546700 exeinto ${DATAPATH} doexe ${GCC_FILESDIR}/fix_libtool_files.sh || die doexe ${GCC_FILESDIR}/c{89,99} || die
[gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
vapier 15/04/13 04:15:59 Modified: toolchain.eclass Log: force the configure shell to bash to work around older configure detection Revision ChangesPath 1.661eclass/toolchain.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.661view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.661content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.660r2=1.661 Index: toolchain.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v retrieving revision 1.660 retrieving revision 1.661 diff -u -r1.660 -r1.661 --- toolchain.eclass29 Mar 2015 19:17:05 - 1.660 +++ toolchain.eclass13 Apr 2015 04:15:59 - 1.661 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.660 2015/03/29 19:17:05 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.661 2015/04/13 04:15:59 vapier Exp $ # Maintainer: Toolchain Ninjas toolch...@gentoo.org @@ -1232,7 +1232,10 @@ # and now to do the actual configuration addwrite /dev/zero echo ${S}/configure ${confgcc[@]} - ${S}/configure ${confgcc[@]} || die failed to run configure + # Older gcc versions did not detect bash and re-exec itself, so force the + # use of bash. Newer ones will auto-detect, but this is not harmeful. + CONFIG_SHELL=/bin/bash \ + bash ${S}/configure ${confgcc[@]} || die failed to run configure # return to whatever directory we were in before popd /dev/null
[gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
vapier 15/04/13 04:16:35 Modified: toolchain.eclass Log: handle versions 6.x+ like 5.x Revision ChangesPath 1.662eclass/toolchain.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.662view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.662content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.661r2=1.662 Index: toolchain.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v retrieving revision 1.661 retrieving revision 1.662 diff -u -r1.661 -r1.662 --- toolchain.eclass13 Apr 2015 04:15:59 - 1.661 +++ toolchain.eclass13 Apr 2015 04:16:35 - 1.662 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.661 2015/04/13 04:15:59 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.662 2015/04/13 04:16:35 vapier Exp $ # Maintainer: Toolchain Ninjas toolch...@gentoo.org @@ -86,9 +86,9 @@ SNAPSHOT=${GCC_PV%_rc*}-RC-${GCC_PV##*_rc} fi -if [[ ${SNAPSHOT} == 5.0-* ]] ; then - # The gcc-5 release has dropped the .0 for some reason. - SNAPSHOT=${SNAPSHOT/5.0/5} +if [[ ${SNAPSHOT} == [56789].0-* ]] ; then + # The gcc-5+ releases have dropped the .0 for some reason. + SNAPSHOT=${SNAPSHOT/.0} fi export GCC_FILESDIR=${GCC_FILESDIR:-${FILESDIR}}
[gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
vapier 15/03/29 06:15:31 Modified: toolchain.eclass Log: do not depend on graphite packages when USE=graphite is unavailable #544818 by Michał Górny Revision ChangesPath 1.658eclass/toolchain.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.658view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.658content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.657r2=1.658 Index: toolchain.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v retrieving revision 1.657 retrieving revision 1.658 diff -u -r1.657 -r1.658 --- toolchain.eclass17 Mar 2015 06:34:54 - 1.657 +++ toolchain.eclass29 Mar 2015 06:15:31 - 1.658 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.657 2015/03/17 06:34:54 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.658 2015/03/29 06:15:31 vapier Exp $ # Maintainer: Toolchain Ninjas toolch...@gentoo.org @@ -181,14 +181,16 @@ tc_version_is_at_least 4.5 RDEPEND+= =dev-libs/mpc-0.8.1 -if tc_version_is_at_least 5.0 ; then - RDEPEND+= graphite? ( =dev-libs/isl-0.12 ) -elif tc_version_is_at_least 4.8 ; then - RDEPEND+= - graphite? ( - =dev-libs/cloog-0.18.0 - =dev-libs/isl-0.11.1 - ) +if in_iuse graphite ; then + if tc_version_is_at_least 5.0 ; then + RDEPEND+= graphite? ( =dev-libs/isl-0.12 ) + elif tc_version_is_at_least 4.8 ; then + RDEPEND+= + graphite? ( + =dev-libs/cloog-0.18.0 + =dev-libs/isl-0.11.1 + ) + fi fi DEPEND=${RDEPEND}
[gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
vapier 15/03/29 18:30:34 Modified: toolchain.eclass Log: put each alpha release into its own SLOT Revision ChangesPath 1.659eclass/toolchain.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.659view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.659content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.658r2=1.659 Index: toolchain.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v retrieving revision 1.658 retrieving revision 1.659 diff -u -r1.658 -r1.659 --- toolchain.eclass29 Mar 2015 06:15:31 - 1.658 +++ toolchain.eclass29 Mar 2015 18:30:34 - 1.659 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.658 2015/03/29 06:15:31 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.659 2015/03/29 18:30:34 vapier Exp $ # Maintainer: Toolchain Ninjas toolch...@gentoo.org @@ -157,7 +157,7 @@ IUSE+= ${IUSE_DEF[*]} # Support upgrade paths here or people get pissed -if ! tc_version_is_at_least 4.7 || is_crosscompile || use multislot ; then +if ! tc_version_is_at_least 4.7 || is_crosscompile || use multislot || [[ ${GCC_PV} == *_alpha* ]] ; then SLOT=${GCC_CONFIG_VER} else SLOT=${GCC_BRANCH_VER}
[gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
vapier 15/03/29 19:17:05 Modified: toolchain.eclass Log: Add USE=cilk to control support for the Cilk Plus language. Revision ChangesPath 1.660eclass/toolchain.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.660view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.660content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.659r2=1.660 Index: toolchain.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v retrieving revision 1.659 retrieving revision 1.660 diff -u -r1.659 -r1.660 --- toolchain.eclass29 Mar 2015 18:30:34 - 1.659 +++ toolchain.eclass29 Mar 2015 19:17:05 - 1.660 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.659 2015/03/29 18:30:34 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.660 2015/03/29 19:17:05 vapier Exp $ # Maintainer: Toolchain Ninjas toolch...@gentoo.org @@ -151,6 +151,7 @@ # versions which we dropped. Since graphite was also experimental in # the older versions, we don't want to bother supporting it. #448024 tc_version_is_at_least 4.8 IUSE+= graphite IUSE_DEF+=( sanitize ) + tc_version_is_at_least 4.9 IUSE+= cilk fi [[ ${EAPI:-0} != 0 ]] IUSE_DEF=( ${IUSE_DEF[@]/#/+} ) @@ -1165,7 +1166,10 @@ fi confgcc+=( --disable-libssp ) fi + fi + if in_iuse cilk ; then + confgcc+=( $(use_enable cilk libcilkrts) ) fi # newer gcc's come with libquadmath, but only fortran uses
[gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
vapier 15/03/17 06:34:54 Modified: toolchain.eclass Log: drop x32 support for gcc-4.7 #543578 Revision ChangesPath 1.657eclass/toolchain.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.657view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.657content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.656r2=1.657 Index: toolchain.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v retrieving revision 1.656 retrieving revision 1.657 diff -u -r1.656 -r1.657 --- toolchain.eclass17 Mar 2015 05:24:34 - 1.656 +++ toolchain.eclass17 Mar 2015 06:34:54 - 1.657 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.656 2015/03/17 05:24:34 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.657 2015/03/17 06:34:54 vapier Exp $ # Maintainer: Toolchain Ninjas toolch...@gentoo.org @@ -1084,7 +1084,7 @@ amd64) # drop the older/ABI checks once this get's merged into some # version of gcc upstream - if tc_version_is_at_least 4.7 has x32 $(get_all_abis TARGET) ; then + if tc_version_is_at_least 4.8 has x32 $(get_all_abis TARGET) ; then confgcc+=( --with-abi=$(gcc-abi-map ${TARGET_DEFAULT_ABI}) ) fi ;; @@ -1465,7 +1465,7 @@ if [[ -n ${list} ]] ; then case ${CTARGET} in x86_64*) - tc_version_is_at_least 4.7 confgcc+=( --with-multilib-list=${list:1} ) + tc_version_is_at_least 4.8 confgcc+=( --with-multilib-list=${list:1} ) ;; esac fi
[gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
vapier 15/03/17 05:24:34 Modified: toolchain.eclass Log: disable USE=graphite support for versions older than gcc-4.8 #448024 Revision ChangesPath 1.656eclass/toolchain.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.656view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.656content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.655r2=1.656 Index: toolchain.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v retrieving revision 1.655 retrieving revision 1.656 diff -u -r1.655 -r1.656 --- toolchain.eclass13 Mar 2015 19:59:45 - 1.655 +++ toolchain.eclass17 Mar 2015 05:24:34 - 1.656 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.655 2015/03/13 19:59:45 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.656 2015/03/17 05:24:34 vapier Exp $ # Maintainer: Toolchain Ninjas toolch...@gentoo.org @@ -146,9 +146,11 @@ tc_version_is_at_least 4.1 IUSE+= libssp objc++ tc_version_is_at_least 4.2 IUSE_DEF+=( openmp ) tc_version_is_at_least 4.3 IUSE+= fixed-point - tc_version_is_at_least 4.6 IUSE+= graphite tc_version_is_at_least 4.7 IUSE+= go - tc_version_is_at_least 4.8 IUSE_DEF+=( sanitize ) + # Note: while =gcc-4.7 also supported graphite, it required forked ppl + # versions which we dropped. Since graphite was also experimental in + # the older versions, we don't want to bother supporting it. #448024 + tc_version_is_at_least 4.8 IUSE+= graphite IUSE_DEF+=( sanitize ) fi [[ ${EAPI:-0} != 0 ]] IUSE_DEF=( ${IUSE_DEF[@]/#/+} ) @@ -179,20 +181,14 @@ tc_version_is_at_least 4.5 RDEPEND+= =dev-libs/mpc-0.8.1 -if in_iuse graphite ; then - if tc_version_is_at_least 4.8 ; then - RDEPEND+= - graphite? ( - =dev-libs/cloog-0.18.0 - =dev-libs/isl-0.11.1 - ) - else - RDEPEND+= - graphite? ( - =dev-libs/cloog-ppl-0.15.10 - =dev-libs/ppl-0.11 - ) - fi +if tc_version_is_at_least 5.0 ; then + RDEPEND+= graphite? ( =dev-libs/isl-0.12 ) +elif tc_version_is_at_least 4.8 ; then + RDEPEND+= + graphite? ( + =dev-libs/cloog-0.18.0 + =dev-libs/isl-0.11.1 + ) fi DEPEND=${RDEPEND} @@ -1182,21 +1178,16 @@ confgcc+=( --disable-lto ) fi - # graphite was added in 4.4 but we only support it in 4.6+ due to external - # library issues. 4.6/4.7 uses cloog-ppl which is a fork of CLooG with a - # PPL backend. 4.8+ uses upstream CLooG with the ISL backend. We install - # cloog-ppl into a non-standard location to prevent collisions. - if tc_version_is_at_least 4.8 ; then - confgcc+=( $(use_with graphite cloog) ) + # graphite was added in 4.4 but we only support it in 4.8+ due to external + # library issues. #448024 + if tc_version_is_at_least 5.0 ; then + confgcc+=( $(use_with graphite isl) ) use graphite confgcc+=( --disable-isl-version-check ) - elif tc_version_is_at_least 4.6 ; then + elif tc_version_is_at_least 4.8 ; then confgcc+=( $(use_with graphite cloog) ) - confgcc+=( $(use_with graphite ppl) ) - use graphite confgcc+=( --with-cloog-include=/usr/include/cloog-ppl ) - use graphite confgcc+=( --disable-ppl-version-check ) + use graphite confgcc+=( --disable-isl-version-check ) elif tc_version_is_at_least 4.4 ; then - confgcc+=( --without-cloog ) - confgcc+=( --without-ppl ) + confgcc+=( --without-{cloog,ppl} ) fi if tc_version_is_at_least 4.8 ; then
[gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
vapier 15/03/13 19:59:45 Modified: toolchain.eclass Log: enable multislot for 4.6.x now that has cycled out Revision ChangesPath 1.655eclass/toolchain.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.655view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.655content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.654r2=1.655 Index: toolchain.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v retrieving revision 1.654 retrieving revision 1.655 diff -u -r1.654 -r1.655 --- toolchain.eclass15 Feb 2015 06:54:31 - 1.654 +++ toolchain.eclass13 Mar 2015 19:59:45 - 1.655 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.654 2015/02/15 06:54:31 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.655 2015/03/13 19:59:45 vapier Exp $ # Maintainer: Toolchain Ninjas toolch...@gentoo.org @@ -155,7 +155,7 @@ IUSE+= ${IUSE_DEF[*]} # Support upgrade paths here or people get pissed -if ! tc_version_is_at_least 4.6 || is_crosscompile || use multislot ; then +if ! tc_version_is_at_least 4.7 || is_crosscompile || use multislot ; then SLOT=${GCC_CONFIG_VER} else SLOT=${GCC_BRANCH_VER}
[gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
vapier 15/02/15 06:54:31 Modified: toolchain.eclass Log: reland multislot logic now that the three packages impacted have been updated Revision ChangesPath 1.654eclass/toolchain.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.654view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.654content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.653r2=1.654 Index: toolchain.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v retrieving revision 1.653 retrieving revision 1.654 diff -u -r1.653 -r1.654 --- toolchain.eclass10 Feb 2015 07:22:00 - 1.653 +++ toolchain.eclass15 Feb 2015 06:54:31 - 1.654 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.653 2015/02/10 07:22:00 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.654 2015/02/15 06:54:31 vapier Exp $ # Maintainer: Toolchain Ninjas toolch...@gentoo.org @@ -155,7 +155,7 @@ IUSE+= ${IUSE_DEF[*]} # Support upgrade paths here or people get pissed -if use multislot ; then +if ! tc_version_is_at_least 4.6 || is_crosscompile || use multislot ; then SLOT=${GCC_CONFIG_VER} else SLOT=${GCC_BRANCH_VER}
[gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
vapier 15/02/09 20:05:07 Modified: toolchain.eclass Log: use multislot for all cross-compilers and versions older than gcc-4.6 Revision ChangesPath 1.650eclass/toolchain.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.650view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.650content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.649r2=1.650 Index: toolchain.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v retrieving revision 1.649 retrieving revision 1.650 diff -u -r1.649 -r1.650 --- toolchain.eclass5 Feb 2015 23:28:17 - 1.649 +++ toolchain.eclass9 Feb 2015 20:05:07 - 1.650 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.649 2015/02/05 23:28:17 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.650 2015/02/09 20:05:07 vapier Exp $ # Maintainer: Toolchain Ninjas toolch...@gentoo.org @@ -155,7 +155,7 @@ IUSE+= ${IUSE_DEF[*]} # Support upgrade paths here or people get pissed -if use multislot ; then +if ! tc_version_is_at_least 4.6 || is_crosscompile || use multislot ; then SLOT=${GCC_CONFIG_VER} else SLOT=${GCC_BRANCH_VER}
[gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
blueness15/01/21 21:59:31 Modified: toolchain.eclass Log: Stub out fixed includes, bug #536878. Revision ChangesPath 1.648eclass/toolchain.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.648view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.648content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.647r2=1.648 Index: toolchain.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v retrieving revision 1.647 retrieving revision 1.648 diff -u -r1.647 -r1.648 --- toolchain.eclass15 Nov 2014 08:45:33 - 1.647 +++ toolchain.eclass21 Jan 2015 21:59:31 - 1.648 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.647 2014/11/15 08:45:33 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.648 2015/01/21 21:59:31 blueness Exp $ # Maintainer: Toolchain Ninjas toolch...@gentoo.org @@ -595,6 +595,15 @@ einfo ${f%%...} done fi + + # We don't need fixed header files. This is a gcc hack for dealing with broken + # (ie non-ansi compliant) header files on old unix systems. On modern systems, + # these fixed headers are known to break things. We just stub them out. + if tc_version_is_at_least 4.0; then + echo : ${S}/fixincludes/fixinc.in || die + else + echo : ${S}/gcc/fixinc/fixincl.sh || die + fi } guess_patch_type_in_dir() { @@ -1598,9 +1607,6 @@ toolchain_src_install() { cd ${WORKDIR}/build - # Do allow symlinks in private gcc include dir as this can break the build - find gcc/include*/ -type l -delete - # Copy over the info pages. We disabled their generation earlier, but the # build system only expects to install out of the build dir, not the source. #464008 mkdir -p gcc/doc @@ -1611,13 +1617,6 @@ fi done - # Remove generated headers, as they can cause things to break - # (ncurses, openssl, etc). - while read x ; do - grep -q 'It has been auto-edited by fixincludes from' ${x} \ -rm -f ${x} - done (find gcc/include*/ -name '*.h') - # Do the 'make install' from the build directory S=${WORKDIR}/build emake -j1 DESTDIR=${D} install || die
[gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
vapier 14/11/15 08:45:33 Modified: toolchain.eclass Log: enbale --with-float=hard for arm eabihf tuples #528278 Revision ChangesPath 1.647eclass/toolchain.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.647view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.647content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.646r2=1.647 Index: toolchain.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v retrieving revision 1.646 retrieving revision 1.647 diff -u -r1.646 -r1.647 --- toolchain.eclass4 Nov 2014 08:04:00 - 1.646 +++ toolchain.eclass15 Nov 2014 08:45:33 - 1.647 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.646 2014/11/04 08:04:00 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.647 2014/11/15 08:45:33 vapier Exp $ # Maintainer: Toolchain Ninjas toolch...@gentoo.org @@ -1040,9 +1040,9 @@ *) # If they've explicitly opt-ed in, do hardfloat, # otherwise let the gcc default kick in. - [[ ${CTARGET//_/-} == *-hardfloat-* ]] \ -confgcc+=( --with-float=hard ) - ;; + case ${CTARGET//_/-} in + *-hardfloat-*|*eabihf) confgcc+=( --with-float=hard ) ;; + esac esac local with_abi_map=()
[gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
vapier 14/11/02 21:30:11 Modified: toolchain.eclass Log: enable multislot for all versions 4.7 Revision ChangesPath 1.645eclass/toolchain.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.645view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.645content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.644r2=1.645 Index: toolchain.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v retrieving revision 1.644 retrieving revision 1.645 diff -u -r1.644 -r1.645 --- toolchain.eclass26 Oct 2014 17:39:52 - 1.644 +++ toolchain.eclass2 Nov 2014 21:30:11 - 1.645 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.644 2014/10/26 17:39:52 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.645 2014/11/02 21:30:11 vapier Exp $ # Maintainer: Toolchain Ninjas toolch...@gentoo.org @@ -155,7 +155,7 @@ IUSE+= ${IUSE_DEF[*]} # Support upgrade paths here or people get pissed -if use multislot ; then +if ! tc_version_is_at_least 4.7 || use multislot ; then SLOT=${GCC_CONFIG_VER} else SLOT=${GCC_BRANCH_VER}
[gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass ChangeLog
ulm 14/10/26 17:39:52 Modified: toolchain.eclass ChangeLog Log: [QA] Code from revisions 1.636 and 1.640 commented out. This causes several file collisions, see bug 526144 and related bugs. Revision ChangesPath 1.644eclass/toolchain.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.644view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.644content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.643r2=1.644 Index: toolchain.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v retrieving revision 1.643 retrieving revision 1.644 diff -u -r1.643 -r1.644 --- toolchain.eclass24 Oct 2014 05:32:14 - 1.643 +++ toolchain.eclass26 Oct 2014 17:39:52 - 1.644 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.643 2014/10/24 05:32:14 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.644 2014/10/26 17:39:52 ulm Exp $ # Maintainer: Toolchain Ninjas toolch...@gentoo.org @@ -910,15 +910,15 @@ confgcc+=( --enable-libstdcxx-time ) fi - # Turn on the -Wl,--build-id flag by default for ELF targets. #525942 - # This helps with locating debug files. - case ${CTARGET} in - *-linux-*|*-elf|*-eabi) - tc_version_is_at_least 4.5 confgcc+=( - --enable-linker-build-id - ) - ;; - esac + # # Turn on the -Wl,--build-id flag by default for ELF targets. #525942 + # # This helps with locating debug files. + # case ${CTARGET} in + # *-linux-*|*-elf|*-eabi) + # tc_version_is_at_least 4.5 confgcc+=( + # --enable-linker-build-id + # ) + # ;; + # esac # newer gcc versions like to bootstrap themselves with C++, # so we need to manually disable it ourselves 1.1392 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1392view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1392content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1391r2=1.1392 Index: ChangeLog === RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1391 retrieving revision 1.1392 diff -u -r1.1391 -r1.1392 --- ChangeLog 25 Oct 2014 19:01:53 - 1.1391 +++ ChangeLog 26 Oct 2014 17:39:52 - 1.1392 @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1391 2014/10/25 19:01:53 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1392 2014/10/26 17:39:52 ulm Exp $ + + 26 Oct 2014; Ulrich Müller u...@gentoo.org toolchain.eclass: + [QA] Code from revisions 1.636 and 1.640 commented out. This causes several + file collisions, see bug 526144 and related bugs. 25 Oct 2014; Michael Palimaka kensing...@gentoo.org kde4-base.eclass: Add kde-workspace 4.11.13 SRC_URI.
[gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
vapier 14/10/24 00:21:54 Modified: toolchain.eclass Log: expand LICENSE handling for all versions Revision ChangesPath 1.641eclass/toolchain.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.641view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.641content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.640r2=1.641 Index: toolchain.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v retrieving revision 1.640 retrieving revision 1.641 diff -u -r1.640 -r1.641 --- toolchain.eclass20 Oct 2014 17:16:45 - 1.640 +++ toolchain.eclass24 Oct 2014 00:21:54 - 1.641 @@ -1,12 +1,11 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.640 2014/10/20 17:16:45 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.641 2014/10/24 00:21:54 vapier Exp $ # Maintainer: Toolchain Ninjas toolch...@gentoo.org DESCRIPTION=The GNU Compiler Collection HOMEPAGE=http://gcc.gnu.org/; -LICENSE=GPL-2 LGPL-2.1 RESTRICT=strip # cross-compilers need controlled stripping inherit eutils fixheadtails flag-o-matic gnuconfig libtool multilib pax-utils toolchain-funcs versionator @@ -115,7 +114,21 @@ # We will handle /usr/include/g++-v3/ with gcc-config ... STDCXX_INCDIR=${TOOLCHAIN_STDCXX_INCDIR:-${LIBPATH}/include/g++-v${GCC_BRANCH_VER/\.*/}} -# SLOT+IUSE logic +# LICENSE+SLOT+IUSE logic + +if tc_version_is_at_least 4.6 ; then + LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+ +elif tc_version_is_at_least 4.4 ; then + LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2+ +elif tc_version_is_at_least 4.3 ; then + LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ ) FDL-1.2+ +elif tc_version_is_at_least 4.2 ; then + LICENSE=GPL-3+ LGPL-2.1+ || ( GPL-3+ libgcc libstdc++ ) FDL-1.2+ +elif tc_version_is_at_least 3.3 ; then + LICENSE=GPL-2+ LGPL-2.1+ FDL-1.2+ +else + LICENSE=GPL-2+ LGPL-2.1+ FDL-1.1+ +fi IUSE=multislot regression-test vanilla IUSE_DEF=( nls nptl )
[gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
vapier 14/10/24 05:32:14 Modified: toolchain.eclass Log: rework gcc-5.x snapshots again Revision ChangesPath 1.643eclass/toolchain.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.643view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.643content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.642r2=1.643 Index: toolchain.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v retrieving revision 1.642 retrieving revision 1.643 diff -u -r1.642 -r1.643 --- toolchain.eclass24 Oct 2014 00:29:34 - 1.642 +++ toolchain.eclass24 Oct 2014 05:32:14 - 1.643 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.642 2014/10/24 00:29:34 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.643 2014/10/24 05:32:14 vapier Exp $ # Maintainer: Toolchain Ninjas toolch...@gentoo.org @@ -86,9 +86,9 @@ SNAPSHOT=${GCC_PV%_rc*}-RC-${GCC_PV##*_rc} fi -if [[ ${SNAPSHOT} == 5.0.0-* ]] ; then +if [[ ${SNAPSHOT} == 5.0-* ]] ; then # The gcc-5 release has dropped the .0 for some reason. - SNAPSHOT=${SNAPSHOT/5.0.0/5} + SNAPSHOT=${SNAPSHOT/5.0/5} fi export GCC_FILESDIR=${GCC_FILESDIR:-${FILESDIR}} @@ -314,11 +314,14 @@ # Set where to download gcc itself depending on whether we're using a # prerelease, snapshot, or release tarball. - if [[ -n ${PRERELEASE} ]] ; then + if [[ ${PV} == ** ]] ; then + # Nothing to do w/git snapshots. + : + elif [[ -n ${PRERELEASE} ]] ; then GCC_SRC_URI=ftp://gcc.gnu.org/pub/gcc/prerelease-${PRERELEASE}/gcc-${PRERELEASE}.tar.bz2; elif [[ -n ${SNAPSHOT} ]] ; then GCC_SRC_URI=ftp://gcc.gnu.org/pub/gcc/snapshots/${SNAPSHOT}/gcc-${SNAPSHOT}.tar.bz2; - elif [[ ${PV} != ** ]] ; then + else GCC_SRC_URI=mirror://gnu/gcc/gcc-${GCC_PV}/gcc-${GCC_RELEASE_VER}.tar.bz2 # we want all branch updates to be against the main release [[ -n ${BRANCH_UPDATE} ]] \
[gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
vapier 14/10/20 17:16:45 Modified: toolchain.eclass Log: restrict --enable-linker-build-id to known ELF targets #525942 Revision ChangesPath 1.640eclass/toolchain.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.640view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.640content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.639r2=1.640 Index: toolchain.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v retrieving revision 1.639 retrieving revision 1.640 diff -u -r1.639 -r1.640 --- toolchain.eclass19 Oct 2014 05:42:28 - 1.639 +++ toolchain.eclass20 Oct 2014 17:16:45 - 1.640 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.639 2014/10/19 05:42:28 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.640 2014/10/20 17:16:45 vapier Exp $ # Maintainer: Toolchain Ninjas toolch...@gentoo.org @@ -894,11 +894,15 @@ confgcc+=( --enable-libstdcxx-time ) fi - # Turn on the -Wl,--build-id flag by default. + # Turn on the -Wl,--build-id flag by default for ELF targets. #525942 # This helps with locating debug files. - tc_version_is_at_least 4.5 confgcc+=( - --enable-linker-build-id - ) + case ${CTARGET} in + *-linux-*|*-elf|*-eabi) + tc_version_is_at_least 4.5 confgcc+=( + --enable-linker-build-id + ) + ;; + esac # newer gcc versions like to bootstrap themselves with C++, # so we need to manually disable it ourselves
[gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
vapier 14/10/19 05:38:32 Modified: toolchain.eclass Log: use arrays for IUSE_DEF to simplify code Revision ChangesPath 1.638eclass/toolchain.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.638view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.638content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.637r2=1.638 Index: toolchain.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v retrieving revision 1.637 retrieving revision 1.638 diff -u -r1.637 -r1.638 --- toolchain.eclass17 Oct 2014 04:02:50 - 1.637 +++ toolchain.eclass19 Oct 2014 05:38:32 - 1.638 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.637 2014/10/17 04:02:50 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.638 2014/10/19 05:38:32 vapier Exp $ # Maintainer: Toolchain Ninjas toolch...@gentoo.org @@ -118,11 +118,11 @@ # SLOT+IUSE logic IUSE=multislot regression-test vanilla -IUSE_DEF=nls nptl +IUSE_DEF=( nls nptl ) if [[ ${PN} != kgcc64 ${PN} != gcc-* ]] ; then IUSE+= altivec - IUSE_DEF+= cxx fortran + IUSE_DEF+=( cxx fortran ) [[ -n ${PIE_VER} ]] IUSE+= nopie [[ -n ${HTB_VER} ]] IUSE+= boundschecking [[ -n ${D_VER} ]] IUSE+= d @@ -131,14 +131,14 @@ tc_version_is_at_least 4.0 IUSE+= objc-gc tc_version_is_between 4.0 4.9 IUSE+= mudflap tc_version_is_at_least 4.1 IUSE+= libssp objc++ - tc_version_is_at_least 4.2 IUSE_DEF+= openmp + tc_version_is_at_least 4.2 IUSE_DEF+=( openmp ) tc_version_is_at_least 4.3 IUSE+= fixed-point tc_version_is_at_least 4.6 IUSE+= graphite tc_version_is_at_least 4.7 IUSE+= go fi -[[ ${EAPI:-0} != 0 ]] IUSE_DEF=+${IUSE_DEF// / +} -IUSE+= ${IUSE_DEF} +[[ ${EAPI:-0} != 0 ]] IUSE_DEF=( ${IUSE_DEF[@]/#/+} ) +IUSE+= ${IUSE_DEF[*]} # Support upgrade paths here or people get pissed if use multislot ; then
[gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
vapier 14/10/19 05:42:28 Modified: toolchain.eclass Log: add USE=sanitize to control libsanitizer #525174 by Lukas Lihotzki Revision ChangesPath 1.639eclass/toolchain.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.639view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.639content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.638r2=1.639 Index: toolchain.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v retrieving revision 1.638 retrieving revision 1.639 diff -u -r1.638 -r1.639 --- toolchain.eclass19 Oct 2014 05:38:32 - 1.638 +++ toolchain.eclass19 Oct 2014 05:42:28 - 1.639 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.638 2014/10/19 05:38:32 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.639 2014/10/19 05:42:28 vapier Exp $ # Maintainer: Toolchain Ninjas toolch...@gentoo.org @@ -135,6 +135,7 @@ tc_version_is_at_least 4.3 IUSE+= fixed-point tc_version_is_at_least 4.6 IUSE+= graphite tc_version_is_at_least 4.7 IUSE+= go + tc_version_is_at_least 4.8 IUSE_DEF+=( sanitize ) fi [[ ${EAPI:-0} != 0 ]] IUSE_DEF=( ${IUSE_DEF[@]/#/+} ) @@ -1178,6 +1179,10 @@ confgcc+=( --without-ppl ) fi + if tc_version_is_at_least 4.8 ; then + confgcc+=( $(use_enable sanitize libsanitizer) ) + fi + # Disable gcc info regeneration -- it ships with generated info pages # already. Our custom version/urls/etc... trigger it. #464008 export gcc_cv_prog_makeinfo_modern=no
[gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
vapier 14/10/17 02:48:01 Modified: toolchain.eclass Log: enable --enable-linker-build-id by default with gcc-4.5+ Revision ChangesPath 1.636eclass/toolchain.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.636view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.636content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.635r2=1.636 Index: toolchain.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v retrieving revision 1.635 retrieving revision 1.636 diff -u -r1.635 -r1.636 --- toolchain.eclass5 Aug 2014 01:41:01 - 1.635 +++ toolchain.eclass17 Oct 2014 02:48:01 - 1.636 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.635 2014/08/05 01:41:01 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.636 2014/10/17 02:48:01 vapier Exp $ # Maintainer: Toolchain Ninjas toolch...@gentoo.org @@ -891,6 +891,12 @@ confgcc+=( --enable-libstdcxx-time ) fi + # Turn on the -Wl,--build-id flag by default. + # This helps with locating debug files. + tc_version_is_at_least 4.5 confgcc+=( + --enable-linker-build-id + ) + # newer gcc versions like to bootstrap themselves with C++, # so we need to manually disable it ourselves if tc_version_is_between 4.7 4.8 ! is_cxx ; then
[gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
vapier 14/10/17 04:02:50 Modified: toolchain.eclass Log: handle the new gcc-5.x snapshots which changed their versioning slightly Revision ChangesPath 1.637eclass/toolchain.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.637view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.637content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.636r2=1.637 Index: toolchain.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v retrieving revision 1.636 retrieving revision 1.637 diff -u -r1.636 -r1.637 --- toolchain.eclass17 Oct 2014 02:48:01 - 1.636 +++ toolchain.eclass17 Oct 2014 04:02:50 - 1.637 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.636 2014/10/17 02:48:01 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.637 2014/10/17 04:02:50 vapier Exp $ # Maintainer: Toolchain Ninjas toolch...@gentoo.org @@ -77,12 +77,9 @@ GCC_CONFIG_VER=${GCC_CONFIG_VER:-$(replace_version_separator 3 '-' ${GCC_PV})} # Pre-release support -if [[ ${GCC_PV} != ${GCC_PV/_pre/-} ]] ; then +if [[ ${GCC_PV} == *_pre* ]] ; then PRERELEASE=${GCC_PV/_pre/-} -fi - -# make _alpha and _beta ebuilds automatically use a snapshot -if [[ ${GCC_PV} == *_alpha* ]] ; then +elif [[ ${GCC_PV} == *_alpha* ]] ; then SNAPSHOT=${GCC_BRANCH_VER}-${GCC_PV##*_alpha} elif [[ ${GCC_PV} == *_beta* ]] ; then SNAPSHOT=${GCC_BRANCH_VER}-${GCC_PV##*_beta} @@ -90,6 +87,11 @@ SNAPSHOT=${GCC_PV%_rc*}-RC-${GCC_PV##*_rc} fi +if [[ ${SNAPSHOT} == 5.0.0-* ]] ; then + # The gcc-5 release has dropped the .0 for some reason. + SNAPSHOT=${SNAPSHOT/5.0.0/5} +fi + export GCC_FILESDIR=${GCC_FILESDIR:-${FILESDIR}} PREFIX=${TOOLCHAIN_PREFIX:-/usr}
[gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
robbat2 14/08/05 01:04:21 Modified: toolchain.eclass Log: Fix typo. Revision ChangesPath 1.634eclass/toolchain.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.634view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.634content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.633r2=1.634 Index: toolchain.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v retrieving revision 1.633 retrieving revision 1.634 diff -p -w -b -B -u -u -r1.633 -r1.634 --- toolchain.eclass4 Aug 2014 23:03:28 - 1.633 +++ toolchain.eclass5 Aug 2014 01:04:21 - 1.634 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.633 2014/08/04 23:03:28 zorry Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.634 2014/08/05 01:04:21 robbat2 Exp $ # Maintainer: Toolchain Ninjas toolch...@gentoo.org @@ -2163,7 +2163,7 @@ hardened_gcc_is_stable() { elif [[ $1 == ssp ]] ; then if [[ ${CTARGET} == *-uclibc* ]] ; then tocheck=${SSP_UCLIBC_STABLE} - elfi [[ ${CTARGET} == *-gnu* ]] ; then + elif [[ ${CTARGET} == *-gnu* ]] ; then tocheck=${SSP_STABLE} fi else
[gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
vapier 14/06/01 17:29:42 Modified: toolchain.eclass Log: downgrade_arch_flags: simplify bash logic a bit Revision ChangesPath 1.631eclass/toolchain.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.631view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.631content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.630r2=1.631 Index: toolchain.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v retrieving revision 1.630 retrieving revision 1.631 diff -u -r1.630 -r1.631 --- toolchain.eclass21 May 2014 21:30:26 - 1.630 +++ toolchain.eclass1 Jun 2014 17:29:42 - 1.631 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.630 2014/05/21 21:30:26 rhill Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.631 2014/06/01 17:29:42 vapier Exp $ # Maintainer: Toolchain Ninjas toolch...@gentoo.org @@ -619,7 +619,6 @@ # configure to build with the hardened GCC specs as the default make_gcc_hard() { - # we want to be able to control the pie patch logic via something other # than ALL_CFLAGS... sed -e '/^ALL_CFLAGS/iHARD_CFLAGS = ' \ @@ -1222,8 +1221,8 @@ # If -march=native isn't supported we have to tease out the actual arch if [[ ${myarch} == native || ${mytune} == native ]] ; then if [[ ${bver} 4.2 ]] ; then - arch=$(echo | $(tc-getCC) -march=native -v -E - 21 \ -| grep cc1 | sed -e 's:.*-march=\([^ ]*\).*:\1:') + arch=$($(tc-getCC) -march=native -v -E -P - /dev/null 21 \ + | sed -rn /cc1.*-march/s:.*-march=([^ ']*).*:\1:p) replace-cpu-flags native ${arch} fi fi @@ -1234,55 +1233,56 @@ [[ ${mytune} == x86-64 ]] filter-flags '-mtune=*' [[ ${bver} 3.4 ]] filter-flags '-mtune=*' - declare -a archlist - # arch added replacement - archlist=(bdver4 4.9 bdver3) - archlist+=(bonnell 4.9 atom) - archlist+=(broadwell 4.9 core-avx2) - archlist+=(haswell 4.9 core-avx2) - archlist+=(ivybridge 4.9 core-avx-i) - archlist+=(nehalem 4.9 corei7) - archlist+=(sandybridge 4.9 corei7-avx) - archlist+=(silvermont 4.9 corei7) - archlist+=(westmere 4.9 corei7) - archlist+=(bdver3 4.8 bdver2) - archlist+=(btver2 4.8 btver1) - archlist+=(bdver2 4.7 bdver1) - archlist+=(core-avx2 4.7 core-avx-i) - archlist+=(bdver1 4.6 amdfam10) - archlist+=(btver1 4.6 amdfam10) - archlist+=(core-avx-i 4.6 core2) - archlist+=(corei7 4.6 core2) - archlist+=(corei7-avx 4.6 core2) - archlist+=(atom 4.5 core2) - archlist+=(amdfam10 4.3 k8) - archlist+=(athlon64-sse3 4.3 k8) - archlist+=(barcelona 4.3 k8) - archlist+=(core2 4.3 nocona) - archlist+=(geode 4.3 k6-2) # gcc.gnu.org/PR41989#c22 - archlist+=(k8-sse3 4.3 k8) - archlist+=(opteron-sse3 4.3 k8) - archlist+=(athlon-fx 3.4 x86-64) - archlist+=(athlon64 3.4 x86-64) - archlist+=(c3-2 3.4 c3) - archlist+=(k8 3.4 x86-64) - archlist+=(opteron 3.4 x86-64) - archlist+=(pentium-m 3.4 pentium3) - archlist+=(pentium3m 3.4 pentium3) - archlist+=(pentium4m 3.4 pentium4) + local archlist=( + # added arch replacement + 4.9 bdver4 bdver3 + 4.9 bonnell atom + 4.9 broadwell core-avx2 + 4.9 haswell core-avx2 + 4.9 ivybridge core-avx-i + 4.9 nehalem corei7 + 4.9 sandybridge corei7-avx + 4.9 silvermont corei7 + 4.9 westmere corei7 + 4.8 bdver3 bdver2 + 4.8 btver2 btver1 + 4.7 bdver2 bdver1 + 4.7 core-avx2 core-avx-i + 4.6 bdver1 amdfam10 + 4.6 btver1 amdfam10 + 4.6 core-avx-i core2 + 4.6 corei7 core2 + 4.6 corei7-avx core2 + 4.5 atom core2 + 4.3 amdfam10 k8 + 4.3 athlon64-sse3 k8 + 4.3 barcelona k8 + 4.3 core2 nocona + 4.3 geode k6-2 # gcc.gnu.org/PR41989#c22 + 4.3 k8-sse3 k8 + 4.3 opteron-sse3 k8 + 3.4 athlon-fx x86-64 + 3.4 athlon64 x86-64 + 3.4 c3-2 c3 + 3.4 k8 x86-64 + 3.4 opteron x86-64 + 3.4 pentium-m pentium3 + 3.4 pentium3m pentium3 +
[gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
vapier 14/05/18 20:28:27 Modified: toolchain.eclass Log: drop treelang as it only applies to gcc-4.3 and no longer builds with recent bison #510344 Revision ChangesPath 1.626eclass/toolchain.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.626view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.626content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.625r2=1.626 Index: toolchain.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v retrieving revision 1.625 retrieving revision 1.626 diff -u -r1.625 -r1.626 --- toolchain.eclass15 May 2014 05:18:33 - 1.625 +++ toolchain.eclass18 May 2014 20:28:27 - 1.626 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.625 2014/05/15 05:18:33 rhill Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.626 2014/05/18 20:28:27 vapier Exp $ # Maintainer: Toolchain Ninjas toolch...@gentoo.org @@ -835,7 +835,6 @@ fi is_objcxx GCC_LANG+=,obj-c++ fi - is_treelang GCC_LANG+=,treelang # fortran support just got sillier! the lang value can be f77 for # fortran77, f95 for fortran95, or just plain old fortran for the @@ -2111,14 +2110,6 @@ use cxx use_if_iuse objc++ } -is_treelang() { - use_if_iuse boundschecking return 1 #260532 - is_crosscompile return 1 #199924 - gcc-lang-supported treelang || return 1 - #use treelang - return 0 -} - # Grab a variable from the build system (taken from linux-info.eclass) get_make_var() { local var=$1 makefile=${2:-${WORKDIR}/build/Makefile}