* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2007-11-11 20:29 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2007-11-11 20:29 UTC (permalink / raw
To: gentoo-commits
vapier 07/11/11 20:29:26
Modified: toolchain.eclass
Log:
apply gcc-configure-texinfo.patch
Revision Changes Path
1.340 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.340&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.340&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.339&r2=1.340
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.339
retrieving revision 1.340
diff -u -r1.339 -r1.340
--- toolchain.eclass 20 Jul 2007 04:59:51 -0000 1.339
+++ toolchain.eclass 11 Nov 2007 20:29:26 -0000 1.340
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.339 2007/07/20 04:59:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.340 2007/11/11 20:29:26 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1097,8 +1097,9 @@
# update configure files
local f
einfo "Fixing misc issues in configure files"
+ epatch "${GCC_FILESDIR}"/gcc-configure-texinfo.patch
for f in $(grep -l 'autoconf version 2.13' $(find "${S}" -name configure)) ; do
- ebegin " Updating ${f/${S}\/}"
+ ebegin " Updating ${f/${S}\/} [LANG]"
patch "${f}" "${GCC_FILESDIR}"/gcc-configure-LANG.patch >& "${T}"/configure-patch.log \
|| eerror "Please file a bug about this"
eend $?
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2007-11-12 15:23 Diego Petteno (flameeyes)
0 siblings, 0 replies; 266+ messages in thread
From: Diego Petteno (flameeyes) @ 2007-11-12 15:23 UTC (permalink / raw
To: gentoo-commits
flameeyes 07/11/12 15:23:38
Modified: toolchain.eclass
Log:
Apply the texinfo fix only on GCC 4, as GCC 3.4 does not have that
codepath anyway, and was failing unpack.
Revision Changes Path
1.341 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.341&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.341&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.340&r2=1.341
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.340
retrieving revision 1.341
diff -u -r1.340 -r1.341
--- toolchain.eclass 11 Nov 2007 20:29:26 -0000 1.340
+++ toolchain.eclass 12 Nov 2007 15:23:37 -0000 1.341
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.340 2007/11/11 20:29:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.341 2007/11/12 15:23:37 flameeyes Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1097,7 +1097,7 @@
# update configure files
local f
einfo "Fixing misc issues in configure files"
- epatch "${GCC_FILESDIR}"/gcc-configure-texinfo.patch
+ [[ ${GCCMAJOR} == 4 ]] && epatch "${GCC_FILESDIR}"/gcc-configure-texinfo.patch
for f in $(grep -l 'autoconf version 2.13' $(find "${S}" -name configure)) ; do
ebegin " Updating ${f/${S}\/} [LANG]"
patch "${f}" "${GCC_FILESDIR}"/gcc-configure-LANG.patch >& "${T}"/configure-patch.log \
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2007-11-12 19:33 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2007-11-12 19:33 UTC (permalink / raw
To: gentoo-commits
vapier 07/11/12 19:33:01
Modified: toolchain.eclass
Log:
apply to gcc-4+
Revision Changes Path
1.342 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.342&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.342&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.341&r2=1.342
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -r1.341 -r1.342
--- toolchain.eclass 12 Nov 2007 15:23:37 -0000 1.341
+++ toolchain.eclass 12 Nov 2007 19:33:00 -0000 1.342
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.341 2007/11/12 15:23:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.342 2007/11/12 19:33:00 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1097,7 +1097,7 @@
# update configure files
local f
einfo "Fixing misc issues in configure files"
- [[ ${GCCMAJOR} == 4 ]] && epatch "${GCC_FILESDIR}"/gcc-configure-texinfo.patch
+ [[ ${GCCMAJOR} -ge 4 ]] && epatch "${GCC_FILESDIR}"/gcc-configure-texinfo.patch
for f in $(grep -l 'autoconf version 2.13' $(find "${S}" -name configure)) ; do
ebegin " Updating ${f/${S}\/} [LANG]"
patch "${f}" "${GCC_FILESDIR}"/gcc-configure-LANG.patch >& "${T}"/configure-patch.log \
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2007-11-20 5:06 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2007-11-20 5:06 UTC (permalink / raw
To: gentoo-commits
vapier 07/11/20 05:06:19
Modified: toolchain.eclass
Log:
enable treelang by default when possible
Revision Changes Path
1.343 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.343&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.343&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.342&r2=1.343
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.342
retrieving revision 1.343
diff -u -r1.342 -r1.343
--- toolchain.eclass 12 Nov 2007 19:33:00 -0000 1.342
+++ toolchain.eclass 20 Nov 2007 05:06:18 -0000 1.343
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.342 2007/11/12 19:33:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.343 2007/11/20 05:06:18 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1184,6 +1184,7 @@
use objc-gc && confgcc="${confgcc} --enable-objc-gc"
is_objcxx && GCC_LANG="${GCC_LANG},obj-c++"
fi
+ is_treelang && GCC_LANG="${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
@@ -2383,3 +2384,10 @@
use build && return 1
use ada
}
+
+is_treelang() {
+ gcc-lang-supported treelang || return 1
+ use build && return 1
+ #use treelang
+ return 0
+}
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2007-12-01 18:33 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2007-12-01 18:33 UTC (permalink / raw
To: gentoo-commits
vapier 07/12/01 18:33:18
Modified: toolchain.eclass
Log:
mark treelang as unavailable to cross-compilers #199924
Revision Changes Path
1.344 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.344&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.344&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.343&r2=1.344
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.343
retrieving revision 1.344
diff -u -r1.343 -r1.344
--- toolchain.eclass 20 Nov 2007 05:06:18 -0000 1.343
+++ toolchain.eclass 1 Dec 2007 18:33:18 -0000 1.344
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.343 2007/11/20 05:06:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.344 2007/12/01 18:33:18 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -2386,6 +2386,7 @@
}
is_treelang() {
+ is_crosscompile && return 1 #199924
gcc-lang-supported treelang || return 1
use build && return 1
#use treelang
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2008-02-05 18:09 Thomas Alan Gall (tgall)
0 siblings, 0 replies; 266+ messages in thread
From: Thomas Alan Gall (tgall) @ 2008-02-05 18:09 UTC (permalink / raw
To: gentoo-commits
tgall 08/02/05 18:09:59
Modified: toolchain.eclass
Log:
remove use of make profiledbootstrap by ppc64
Revision Changes Path
1.345 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.345&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.345&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.344&r2=1.345
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -r1.344 -r1.345
--- toolchain.eclass 1 Dec 2007 18:33:18 -0000 1.344
+++ toolchain.eclass 5 Feb 2008 18:09:58 -0000 1.345
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.344 2007/12/01 18:33:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.345 2008/02/05 18:09:58 tgall Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1375,7 +1375,7 @@
# 3 stage bootstrapping doesnt quite work when you cant run the
# resulting binaries natively ^^;
GCC_MAKE_TARGET=${GCC_MAKE_TARGET-all}
- elif [[ $(tc-arch) == "x86" || $(tc-arch) == "amd64" || $(tc-arch) == "ppc64" ]] \
+ elif [[ $(tc-arch) == "x86" || $(tc-arch) == "amd64" ]] \
&& [[ ${GCCMAJOR}.${GCCMINOR} > 3.3 ]]
then
GCC_MAKE_TARGET=${GCC_MAKE_TARGET-profiledbootstrap}
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2008-02-16 22:27 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2008-02-16 22:27 UTC (permalink / raw
To: gentoo-commits
vapier 08/02/16 22:27:51
Modified: toolchain.eclass
Log:
add support for USE=libffi #199850
Revision Changes Path
1.346 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.346&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.346&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.345&r2=1.346
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.345
retrieving revision 1.346
diff -u -r1.345 -r1.346
--- toolchain.eclass 5 Feb 2008 18:09:58 -0000 1.345
+++ toolchain.eclass 16 Feb 2008 22:27:51 -0000 1.346
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.345 2008/02/05 18:09:58 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.346 2008/02/16 22:27:51 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -144,8 +144,8 @@
[[ -n ${HTB_VER} ]] && IUSE="${IUSE} boundschecking"
[[ -n ${D_VER} ]] && IUSE="${IUSE} d"
- if version_is_at_least 3 ; then
- IUSE="${IUSE} bootstrap doc gcj gtk hardened multilib objc vanilla"
+ if tc_version_is_at_least 3 ; then
+ IUSE="${IUSE} bootstrap doc gcj gtk hardened libffi multilib objc vanilla"
# gcc-{nios2,bfin} don't accept these
if [[ ${PN} == "gcc" ]] ; then
@@ -958,6 +958,14 @@
einfo "updating configuration to build hardened GCC"
make_gcc_hard || die "failed to make gcc hard"
fi
+
+ if is_libffi ; then
+ # move the libffi target out of gcj and into all
+ sed -i \
+ -e '/^libgcj=/s:target-libffi::' \
+ -e '/^target_lib/s:=":="target-libffi :' \
+ "${S}"/configure || die
+ fi
}
gcc-library_src_unpack() {
:
@@ -1720,10 +1728,9 @@
# "#include <ffitarget.h>" which (correctly, as it's an "extra" file)
# is installed in .../GCCVER/include/libffi; the following fixes
# ffi.'s include of ffitarget.h - Armando Di Cianno <fafhrd@gentoo.org>
- if is_objc && ! is_gcj ; then
- #dosed "s:<ffitarget.h>:<libffi/ffitarget.h>:g" /${LIBPATH}/include/ffi.h
- mv "${D}"${LIBPATH}/include/libffi/* "${D}"${LIBPATH}/include
- rm -Rf "${D}"${LIBPATH}/include/libffi
+ if [[ -d ${D}${LIBPATH}/include/libffi ]] ; then
+ mv -i "${D}"${LIBPATH}/include/libffi/* "${D}"${LIBPATH}/include || die
+ rm -r "${D}"${LIBPATH}/include/libffi || die
fi
fi
@@ -2367,6 +2374,12 @@
use gcj
}
+is_libffi() {
+ has libffi ${USE} || return 1
+ use build && return 1
+ use libffi
+}
+
is_objc() {
gcc-lang-supported objc || return 1
use build && return 1
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2008-03-17 1:51 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2008-03-17 1:51 UTC (permalink / raw
To: gentoo-commits
vapier 08/03/17 01:51:50
Modified: toolchain.eclass
Log:
add url/branding support for gcc-4.3+
Revision Changes Path
1.347 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.347&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.347&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.346&r2=1.347
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.346
retrieving revision 1.347
diff -u -r1.346 -r1.347
--- toolchain.eclass 16 Feb 2008 22:27:51 -0000 1.346
+++ toolchain.eclass 17 Mar 2008 01:51:49 -0000 1.347
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.346 2008/02/16 22:27:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.347 2008/03/17 01:51:49 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -562,7 +562,7 @@
fi
# rebrand to make bug reports easier
- release_version="${release_version/Gentoo/Gentoo Hardened}"
+ BRANDING_GCC_PKGVERSION=${BRANDING_GCC_PKGVERSION/Gentoo/Gentoo Hardened}
}
# now we generate different spec files so that the user can select a compiler
@@ -1010,7 +1010,7 @@
done
}
gcc_src_unpack() {
- local release_version="Gentoo ${GCC_PVR}"
+ export BRANDING_GCC_PKGVERSION="Gentoo ${GCC_PVR}"
[[ -z ${UCLIBC_VER} ]] && [[ ${CTARGET} == *-uclibc* ]] && die "Sorry, this version does not support uClibc"
@@ -1024,7 +1024,7 @@
guess_patch_type_in_dir "${WORKDIR}"/patch
EPATCH_MULTI_MSG="Applying Gentoo patches ..." \
epatch "${WORKDIR}"/patch
- release_version="${release_version} p${PATCH_VER}"
+ BRANDING_GCC_PKGVERSION="${BRANDING_GCC_PKGVERSION} p${PATCH_VER}"
fi
if [[ -n ${UCLIBC_VER} ]] ; then
guess_patch_type_in_dir "${WORKDIR}"/uclibc
@@ -1055,17 +1055,7 @@
disgusting_gcc_multilib_HACK || die "multilib hack failed"
fi
- local version_string=${GCC_CONFIG_VER}
-
- # Backwards support... add the BRANCH_UPDATE for 3.3.5-r1 and 3.4.3-r1
- # which set it directly rather than using ${GCC_PV}
- if [[ ${GCC_PVR} == "3.3.5-r1" || ${GCC_PVR} = "3.4.3-r1" ]] ; then
- version_string="${version_string} ${BRANCH_UPDATE}"
- fi
-
- einfo "patching gcc version: ${version_string} (${release_version})"
- gcc_version_patch "${version_string}" "${release_version}"
-
+ gcc_version_patch
if [[ ${GCCMAJOR}.${GCCMINOR} > 4.0 ]] ; then
if [[ -n ${SNAPSHOT} || -n ${PRERELEASE} ]] ; then
echo ${PV/_/-} > "${S}"/gcc/BASE-VER
@@ -1326,6 +1316,13 @@
[[ ${CTARGET} == *-uclibc* ]] && [[ ${GCCMAJOR}.${GCCMINOR} > 3.3 ]] \
&& confgcc="${confgcc} --enable-clocale=uclibc"
+ set -- \
+ ${confgcc} \
+ --with-bugurl=http://bugs.gentoo.org/ \
+ --with-pkgversion="${BRANDING_GCC_PKGVERSION}" \
+ "$@" \
+ ${EXTRA_ECONF}
+
# Nothing wrong with a good dose of verbosity
echo
einfo "PREFIX: ${PREFIX}"
@@ -1334,7 +1331,7 @@
einfo "DATAPATH: ${DATAPATH}"
einfo "STDCXX_INCDIR: ${STDCXX_INCDIR}"
echo
- einfo "Configuring GCC with: ${confgcc//--/\n\t--} ${@} ${EXTRA_ECONF}"
+ einfo "Configuring GCC with: ${@//--/\n\t--}"
echo
# Build in a separate build tree
@@ -1343,8 +1340,8 @@
# and now to do the actual configuration
addwrite /dev/zero
- "${S}"/configure ${confgcc} $@ ${EXTRA_ECONF} \
- || die "failed to run configure"
+ echo "${S}"/configure "$@"
+ "${S}"/configure "$@" || die "failed to run configure"
# return to whatever directory we were in before
popd > /dev/null
@@ -1966,7 +1963,7 @@
# modify the bounds checking patch with a regression patch
epatch "${WORKDIR}/bounds-checking-gcc-${HTB_GCC_VER}-${HTB_VER}.patch"
- release_version="${release_version}, HTB-${HTB_GCC_VER}-${HTB_VER}"
+ BRANDING_GCC_PKGVERSION="${BRANDING_GCC_PKGVERSION}, HTB-${HTB_GCC_VER}-${HTB_VER}"
}
# patch in ProPolice Stack Smashing protection
@@ -2028,7 +2025,7 @@
fi
fi
- release_version="${release_version}, ssp-${PP_FVER:-${PP_GCC_VER}-${PP_VER}}"
+ BRANDING_GCC_PKGVERSION="${BRANDING_GCC_PKGVERSION}, ssp-${PP_FVER:-${PP_GCC_VER}-${PP_VER}}"
if want_libssp ; then
update_gcc_for_libssp
else
@@ -2089,7 +2086,7 @@
-e 's|^ALL_CFLAGS = |ALL_CFLAGS = $(HARD_CFLAGS) |' \
-i "${S}"/gcc/Makefile.in
- release_version="${release_version}, pie-${PIE_VER}"
+ BRANDING_GCC_PKGVERSION="${BRANDING_GCC_PKGVERSION}, pie-${PIE_VER}"
}
should_we_gcc_config() {
@@ -2259,17 +2256,20 @@
# This function allows us to gentoo-ize gcc's version number and bugzilla
# URL without needing to use patches.
-#
-# Travis Tilley <lv@gentoo.org> (02 Sep 2004)
-#
gcc_version_patch() {
- [[ -z $1 ]] && die "no arguments to gcc_version_patch"
+ # gcc-4.3+ has configure flags (whoo!)
+ tc_version_is_at_least 4.3 && return 0
+
+ local version_string=${GCC_CONFIG_VER}
+ [[ -n ${BRANCH_UPDATE} ]] && version_string="${version_string} ${BRANCH_UPDATE}"
+
+ einfo "patching gcc version: ${version_string} (${BRANDING_GCC_PKGVERSION})"
if grep -qs VERSUFFIX "${S}"/gcc/version.c ; then
- sed -i -e "s~VERSUFFIX \"\"~VERSUFFIX \" ($2)\"~" \
+ sed -i -e "s~VERSUFFIX \"\"~VERSUFFIX \" (${BRANDING_GCC_PKGVERSION})\"~" \
"${S}"/gcc/version.c || die "failed to update VERSUFFIX with Gentoo branding"
else
- version_string="$1 ($2)"
+ version_string="${version_string} (${BRANDING_GCC_PKGVERSION})"
sed -i -e "s~\(const char version_string\[\] = \"\).*\(\".*\)~\1$version_string\2~" \
"${S}"/gcc/version.c || die "failed to update version.c with Gentoo branding."
fi
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2008-03-23 16:33 Ryan Hill (dirtyepic)
0 siblings, 0 replies; 266+ messages in thread
From: Ryan Hill (dirtyepic) @ 2008-03-23 16:33 UTC (permalink / raw
To: gentoo-commits
dirtyepic 08/03/23 16:33:18
Modified: toolchain.eclass
Log:
Add -k to make check so we always run the full testsuite rather than bail on the first error. Save test results in /usr/share/doc/.
Revision Changes Path
1.348 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.348&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.348&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.347&r2=1.348
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.347
retrieving revision 1.348
diff -u -r1.347 -r1.348
--- toolchain.eclass 17 Mar 2008 01:51:49 -0000 1.347
+++ toolchain.eclass 23 Mar 2008 16:33:17 -0000 1.348
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.347 2008/03/17 01:51:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.348 2008/03/23 16:33:17 dirtyepic Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1563,7 +1563,7 @@
gcc_src_test() {
cd "${WORKDIR}"/build
- make check || ewarn "check failed and that sucks :("
+ make -k check || ewarn "check failed and that sucks :("
}
gcc-library_src_install() {
@@ -1759,6 +1759,14 @@
# prune empty dirs left behind
find "${D}" -type d | xargs rmdir >& /dev/null
+ # install testsuite results
+ if use test; then
+ docinto testsuite
+ find "${WORKDIR}"/build -type f -name "*.sum" -print0 | xargs -0 dodoc
+ find "${WORKDIR}"/build -type f -path "*/testsuite/*.log" -print0 \
+ | xargs -0 dodoc
+ fi
+
# Rather install the script, else portage with changing $FILESDIR
# between binary and source package borks things ....
if ! is_crosscompile ; then
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2008-04-07 6:31 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2008-04-07 6:31 UTC (permalink / raw
To: gentoo-commits
vapier 08/04/07 06:31:09
Modified: toolchain.eclass
Log:
fixup locale ranges in awk scripts #215828
Revision Changes Path
1.349 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.349&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.349&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.348&r2=1.349
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.348
retrieving revision 1.349
diff -u -r1.348 -r1.349
--- toolchain.eclass 23 Mar 2008 16:33:17 -0000 1.348
+++ toolchain.eclass 7 Apr 2008 06:31:09 -0000 1.349
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.348 2008/03/23 16:33:17 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.349 2008/04/07 06:31:09 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1102,6 +1102,7 @@
|| eerror "Please file a bug about this"
eend $?
done
+ sed -i 's|A-Za-z0-9|[:alnum:]|g' "${S}"/gcc/*.awk #215828
if [[ -x contrib/gcc_update ]] ; then
einfo "Touching generated files"
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2008-04-08 0:12 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2008-04-08 0:12 UTC (permalink / raw
To: gentoo-commits
vapier 08/04/08 00:12:26
Modified: toolchain.eclass
Log:
only pass --with-pkgversion with gcc-4.3+ as older versions of gcc have broken handling and it is easier to just not use the flag than worry about patching older versions #214583
Revision Changes Path
1.350 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.350&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.350&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.349&r2=1.350
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.349
retrieving revision 1.350
diff -u -r1.349 -r1.350
--- toolchain.eclass 7 Apr 2008 06:31:09 -0000 1.349
+++ toolchain.eclass 8 Apr 2008 00:12:25 -0000 1.350
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.349 2008/04/07 06:31:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.350 2008/04/08 00:12:25 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1317,12 +1317,10 @@
[[ ${CTARGET} == *-uclibc* ]] && [[ ${GCCMAJOR}.${GCCMINOR} > 3.3 ]] \
&& confgcc="${confgcc} --enable-clocale=uclibc"
- set -- \
- ${confgcc} \
+ tc_version_is_at_least 4.3 && set -- "$@" \
--with-bugurl=http://bugs.gentoo.org/ \
- --with-pkgversion="${BRANDING_GCC_PKGVERSION}" \
- "$@" \
- ${EXTRA_ECONF}
+ --with-pkgversion="${BRANDING_GCC_PKGVERSION}"
+ set -- ${confgcc} "$@" ${EXTRA_ECONF}
# Nothing wrong with a good dose of verbosity
echo
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2008-04-08 3:07 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2008-04-08 3:07 UTC (permalink / raw
To: gentoo-commits
vapier 08/04/08 03:07:59
Modified: toolchain.eclass
Log:
do not mess with LD_LIBRARY_PATH #213838
Revision Changes Path
1.351 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.351&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.351&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.350&r2=1.351
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.350
retrieving revision 1.351
diff -u -r1.350 -r1.351
--- toolchain.eclass 8 Apr 2008 00:12:25 -0000 1.350
+++ toolchain.eclass 8 Apr 2008 03:07:58 -0000 1.351
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.350 2008/04/08 00:12:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.351 2008/04/08 03:07:58 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -839,8 +839,6 @@
}
gcc-compiler_pkg_postinst() {
- export LD_LIBRARY_PATH=${LIBPATH}:${LD_LIBRARY_PATH}
-
if has_version 'app-admin/eselect-compiler' ; then
do_eselect_compiler
else
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2008-04-12 22:54 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2008-04-12 22:54 UTC (permalink / raw
To: gentoo-commits
vapier 08/04/12 22:54:41
Modified: toolchain.eclass
Log:
handle renamed fixed include dir #214151
Revision Changes Path
1.352 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.352&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.352&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.351&r2=1.352
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.351
retrieving revision 1.352
diff -u -r1.351 -r1.352
--- toolchain.eclass 8 Apr 2008 03:07:58 -0000 1.351
+++ toolchain.eclass 12 Apr 2008 22:54:40 -0000 1.352
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.351 2008/04/08 03:07:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.352 2008/04/12 22:54:40 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1607,12 +1607,12 @@
# Do allow symlinks in ${PREFIX}/lib/gcc-lib/${CHOST}/${GCC_CONFIG_VER}/include as
# this can break the build.
- for x in "${WORKDIR}"/build/gcc/include/* ; do
+ for x in "${WORKDIR}"/build/gcc/include*/* ; do
[[ -L ${x} ]] && rm -f "${x}"
done
# Remove generated headers, as they can cause things to break
# (ncurses, openssl, etc).
- for x in $(find "${WORKDIR}"/build/gcc/include/ -name '*.h') ; do
+ for x in $(find "${WORKDIR}"/build/gcc/include*/ -name '*.h') ; do
grep -q 'It has been auto-edited by fixincludes from' "${x}" \
&& rm -f "${x}"
done
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2008-04-22 5:53 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2008-04-22 5:53 UTC (permalink / raw
To: gentoo-commits
vapier 08/04/22 05:53:03
Modified: toolchain.eclass
Log:
shuffle around code to better match when configure options are actually used
Revision Changes Path
1.353 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.353&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.353&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.352&r2=1.353
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.352
retrieving revision 1.353
diff -u -r1.352 -r1.353
--- toolchain.eclass 12 Apr 2008 22:54:40 -0000 1.352
+++ toolchain.eclass 22 Apr 2008 05:53:02 -0000 1.353
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.352 2008/04/12 22:54:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.353 2008/04/22 05:53:02 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1167,8 +1167,7 @@
;;
# Enable sjlj exceptions for backward compatibility on hppa
hppa)
- [[ ${GCC_PV:0:1} == "3" ]] && \
- confgcc="${confgcc} --enable-sjlj-exceptions"
+ [[ ${GCCMAJOR} == "3" ]] && confgcc="${confgcc} --enable-sjlj-exceptions"
;;
esac
@@ -1248,13 +1247,11 @@
fi
# reasonably sane globals (hopefully)
- # --disable-libunwind-exceptions needed till unwind sections get fixed. see ps.m for details
confgcc="${confgcc} \
--with-system-zlib \
--disable-checking \
--disable-werror \
- --enable-secureplt \
- --disable-libunwind-exceptions"
+ --enable-secureplt"
# etype specific configuration
einfo "running ${ETYPE}-configure"
@@ -1299,21 +1296,17 @@
[[ ${CTARGET} == *-elf ]] && confgcc="${confgcc} --with-newlib"
# __cxa_atexit is "essential for fully standards-compliant handling of
# destructors", but apparently requires glibc.
- # --enable-sjlj-exceptions : currently the unwind stuff seems to work
- # for statically linked apps but not dynamic
- # so use setjmp/longjmp exceptions by default
if [[ ${CTARGET} == *-uclibc* ]] ; then
confgcc="${confgcc} --disable-__cxa_atexit --enable-target-optspace"
- [[ ${GCCMAJOR}.${GCCMINOR} == 3.3 ]] && \
- confgcc="${confgcc} --enable-sjlj-exceptions"
+ [[ ${GCCMAJOR}.${GCCMINOR} == 3.3 ]] && confgcc="${confgcc} --enable-sjlj-exceptions"
+ [[ ${GCCMAJOR}.${GCCMINOR} > 3.3 ]] && confgcc="${confgcc} --enable-clocale=uclibc"
elif [[ ${CTARGET} == *-gnu* ]] ; then
confgcc="${confgcc} --enable-__cxa_atexit"
+ confgcc="${confgcc} --enable-clocale=gnu"
elif [[ ${CTARGET} == *-freebsd* ]]; then
confgcc="${confgcc} --enable-__cxa_atexit"
fi
- [[ ${CTARGET} == *-gnu* ]] && confgcc="${confgcc} --enable-clocale=gnu"
- [[ ${CTARGET} == *-uclibc* ]] && [[ ${GCCMAJOR}.${GCCMINOR} > 3.3 ]] \
- && confgcc="${confgcc} --enable-clocale=uclibc"
+ [[ ${GCCMAJOR}.${GCCMINOR} < 3.4 ]] && confgcc="${confgcc} ---disable-libunwind-exceptions"
tc_version_is_at_least 4.3 && set -- "$@" \
--with-bugurl=http://bugs.gentoo.org/ \
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2008-04-22 19:26 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2008-04-22 19:26 UTC (permalink / raw
To: gentoo-commits
vapier 08/04/22 19:26:53
Modified: toolchain.eclass
Log:
fix typo pointed out by Kundai Midzi #218869
Revision Changes Path
1.354 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.354&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.354&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.353&r2=1.354
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.353
retrieving revision 1.354
diff -u -r1.353 -r1.354
--- toolchain.eclass 22 Apr 2008 05:53:02 -0000 1.353
+++ toolchain.eclass 22 Apr 2008 19:26:52 -0000 1.354
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.353 2008/04/22 05:53:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.354 2008/04/22 19:26:52 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1306,7 +1306,7 @@
elif [[ ${CTARGET} == *-freebsd* ]]; then
confgcc="${confgcc} --enable-__cxa_atexit"
fi
- [[ ${GCCMAJOR}.${GCCMINOR} < 3.4 ]] && confgcc="${confgcc} ---disable-libunwind-exceptions"
+ [[ ${GCCMAJOR}.${GCCMINOR} < 3.4 ]] && confgcc="${confgcc} --disable-libunwind-exceptions"
tc_version_is_at_least 4.3 && set -- "$@" \
--with-bugurl=http://bugs.gentoo.org/ \
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2008-06-09 2:33 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2008-06-09 2:33 UTC (permalink / raw
To: gentoo-commits
vapier 08/06/09 02:33:06
Modified: toolchain.eclass
Log:
enable --enable-cld for unstable 4.3 versions
Revision Changes Path
1.356 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.356&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.356&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.355&r2=1.356
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.355
retrieving revision 1.356
diff -u -r1.355 -r1.356
--- toolchain.eclass 2 Jun 2008 15:38:52 -0000 1.355
+++ toolchain.eclass 9 Jun 2008 02:33:06 -0000 1.356
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.355 2008/06/02 15:38:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.356 2008/06/09 02:33:06 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1141,6 +1141,15 @@
export gcc_cv_libc_provides_ssp=yes
confgcc="${confgcc} --disable-libssp"
fi
+
+ # enable the cld workaround until we move things to stable.
+ # by that point, the rest of the software out there should
+ # have caught up.
+ if tc_version_is_at_least "4.3" ; then
+ if ! has ${ARCH} ${KEYWORDS} ; then
+ confgcc="${confgcc} --enable-cld"
+ fi
+ fi
fi
# GTK+ is preferred over xlib in 3.4.x (xlib is unmaintained
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2008-07-06 2:41 Mark Loeser (halcy0n)
0 siblings, 0 replies; 266+ messages in thread
From: Mark Loeser (halcy0n) @ 2008-07-06 2:41 UTC (permalink / raw
To: gentoo-commits
halcy0n 08/07/06 02:41:55
Modified: toolchain.eclass
Log:
Filter out the objc-gc flag for <gcc-4.0. Thanks to Ryan Hill <dirtyepic AT gentoo DOT org> ; bug #137024
Revision Changes Path
1.358 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.358&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.358&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.357&r2=1.358
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.357
retrieving revision 1.358
diff -u -r1.357 -r1.358
--- toolchain.eclass 22 Jun 2008 13:57:42 -0000 1.357
+++ toolchain.eclass 6 Jul 2008 02:41:54 -0000 1.358
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.357 2008/06/22 13:57:42 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.358 2008/07/06 02:41:54 halcy0n Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1186,7 +1186,9 @@
is_gcj && GCC_LANG="${GCC_LANG},java"
if is_objc || is_objcxx ; then
GCC_LANG="${GCC_LANG},objc"
- use objc-gc && confgcc="${confgcc} --enable-objc-gc"
+ if tc_version_is_at_least "4.0" ; then
+ use objc-gc && confgcc="${confgcc} --enable-objc-gc"
+ fi
is_objcxx && GCC_LANG="${GCC_LANG},obj-c++"
fi
is_treelang && GCC_LANG="${GCC_LANG},treelang"
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2008-08-03 1:43 Mark Loeser (halcy0n)
0 siblings, 0 replies; 266+ messages in thread
From: Mark Loeser (halcy0n) @ 2008-08-03 1:43 UTC (permalink / raw
To: gentoo-commits
halcy0n 08/08/03 01:43:31
Modified: toolchain.eclass
Log:
Fix bug #220779; thanks to Andrew John Hughes <gnu_andrew AT member DOT fsf DOT org> and James Le Cuirot <chewi AT aura-online DOT co DOT uk>
Revision Changes Path
1.359 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.359&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.359&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.358&r2=1.359
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.358
retrieving revision 1.359
diff -u -r1.358 -r1.359
--- toolchain.eclass 6 Jul 2008 02:41:54 -0000 1.358
+++ toolchain.eclass 3 Aug 2008 01:43:30 -0000 1.359
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.358 2008/07/06 02:41:54 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.359 2008/08/03 01:43:30 halcy0n Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -340,6 +340,11 @@
[[ -n ${D_VER} ]] && \
GCC_SRC_URI="${GCC_SRC_URI} d? ( mirror://sourceforge/dgcc/gdc-${D_VER}-src.tar.bz2 )"
+ # >= gcc-4.3 no longer bundles ecj.jar
+ tc_version_is_at_least "4.3" && \
+ GCC_SRC_URI="${GCC_SRC_URI}
+ gcj? ( ftp://sourceware.org/pub/java/ecj-${GCC_BRANCH_VER}.jar )"
+
echo "${GCC_SRC_URI}"
}
S=$(gcc_get_s_dir)
@@ -1066,6 +1071,12 @@
cp -pPR "${S}"/libstdc++-v3/config/cpu/i{4,3}86/atomicity.h
fi
+ # >= gcc-4.3 doesn't bundle ecj.jar anymore, so copy it
+ if [[ ${GCCMAJOR}.${GCCMINOR} > 4.2 ]] &&
+ use gcj ; then
+ cp -pPR "${DISTDIR}/ecj-${GCC_BRANCH_VER}.jar" "${S}/ecj.jar" || die
+ fi
+
# disable --as-needed from being compiled into gcc specs
# natively when using a gcc version < 3.4.4
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=14992
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2008-08-11 22:40 Mark Loeser (halcy0n)
0 siblings, 0 replies; 266+ messages in thread
From: Mark Loeser (halcy0n) @ 2008-08-11 22:40 UTC (permalink / raw
To: gentoo-commits
halcy0n 08/08/11 22:40:32
Modified: toolchain.eclass
Log:
Fix SRC_URI so it doesn't have gcj dragged in unless its in IUSE
Revision Changes Path
1.360 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.360&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.360&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.359&r2=1.360
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.359
retrieving revision 1.360
diff -u -r1.359 -r1.360
--- toolchain.eclass 3 Aug 2008 01:43:30 -0000 1.359
+++ toolchain.eclass 11 Aug 2008 22:40:31 -0000 1.360
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.359 2008/08/03 01:43:30 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.360 2008/08/11 22:40:31 halcy0n Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -340,10 +340,13 @@
[[ -n ${D_VER} ]] && \
GCC_SRC_URI="${GCC_SRC_URI} d? ( mirror://sourceforge/dgcc/gdc-${D_VER}-src.tar.bz2 )"
- # >= gcc-4.3 no longer bundles ecj.jar
- tc_version_is_at_least "4.3" && \
- GCC_SRC_URI="${GCC_SRC_URI}
- gcj? ( ftp://sourceware.org/pub/java/ecj-${GCC_BRANCH_VER}.jar )"
+ # >= gcc-4.3 uses ecj.jar and we only add gcj as a use flag under certain
+ # conditions
+ if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then
+ tc_version_is_at_least "4.3" && \
+ GCC_SRC_URI="${GCC_SRC_URI}
+ gcj? ( ftp://sourceware.org/pub/java/ecj-${GCC_BRANCH_VER}.jar )"
+ fi
echo "${GCC_SRC_URI}"
}
@@ -1071,7 +1074,7 @@
cp -pPR "${S}"/libstdc++-v3/config/cpu/i{4,3}86/atomicity.h
fi
- # >= gcc-4.3 doesn't bundle ecj.jar anymore, so copy it
+ # >= gcc-4.3 doesn't bundle ecj.jar, so copy it
if [[ ${GCCMAJOR}.${GCCMINOR} > 4.2 ]] &&
use gcj ; then
cp -pPR "${DISTDIR}/ecj-${GCC_BRANCH_VER}.jar" "${S}/ecj.jar" || die
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2008-08-20 3:15 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2008-08-20 3:15 UTC (permalink / raw
To: gentoo-commits
vapier 08/08/20 03:15:38
Modified: toolchain.eclass
Log:
doxygen target changed with gcc-4.3 #232078
Revision Changes Path
1.361 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.361&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.361&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.360&r2=1.361
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.360
retrieving revision 1.361
diff -u -r1.360 -r1.361
--- toolchain.eclass 11 Aug 2008 22:40:31 -0000 1.360
+++ toolchain.eclass 20 Aug 2008 03:15:38 -0000 1.361
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.360 2008/08/11 22:40:31 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.361 2008/08/20 03:15:38 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1451,8 +1451,13 @@
if ! is_crosscompile && ! use nocxx && use doc ; then
if type -p doxygen > /dev/null ; then
- cd "${CTARGET}"/libstdc++-v3
- emake doxygen-man || ewarn "failed to make docs"
+ if tc_version_is_at_least 4.3 ; then
+ cd "${CTARGET}"/libstdc++-v3/doc
+ emake doc-man-doxygen || ewarn "failed to make docs"
+ elif tc_version_is_at_least 3.0 ; then
+ cd "${CTARGET}"/libstdc++-v3
+ emake doxygen-man || ewarn "failed to make docs"
+ fi
else
ewarn "Skipping libstdc++ manpage generation since you don't have doxygen installed"
fi
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2008-09-29 1:48 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2008-09-29 1:48 UTC (permalink / raw
To: gentoo-commits
vapier 08/09/29 01:48:17
Modified: toolchain.eclass
Log:
have libffi check IUSE, not USE #199850
Revision Changes Path
1.362 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.362&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.362&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.361&r2=1.362
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.361
retrieving revision 1.362
diff -u -r1.361 -r1.362
--- toolchain.eclass 20 Aug 2008 03:15:38 -0000 1.361
+++ toolchain.eclass 29 Sep 2008 01:48:17 -0000 1.362
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.361 2008/08/20 03:15:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.362 2008/09/29 01:48:17 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -2403,7 +2403,7 @@
}
is_libffi() {
- has libffi ${USE} || return 1
+ has libffi ${IUSE} || return 1
use libffi
}
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2008-10-20 1:04 Ryan Hill (dirtyepic)
0 siblings, 0 replies; 266+ messages in thread
From: Ryan Hill (dirtyepic) @ 2008-10-20 1:04 UTC (permalink / raw
To: gentoo-commits
dirtyepic 08/10/20 01:04:38
Modified: toolchain.eclass
Log:
Make USE='-openmp' work. Bug #234841.
Revision Changes Path
1.363 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.363&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.363&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.362&r2=1.363
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.362
retrieving revision 1.363
diff -u -r1.362 -r1.363
--- toolchain.eclass 29 Sep 2008 01:48:17 -0000 1.362
+++ toolchain.eclass 20 Oct 2008 01:04:38 -0000 1.363
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.362 2008/09/29 01:48:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.363 2008/10/20 01:04:38 dirtyepic Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1156,6 +1156,10 @@
confgcc="${confgcc} --disable-libssp"
fi
+ if tc_version_is_at_least "4.2" ; then
+ confgcc="${confgcc} $(use_enable openmp libgomp)"
+ fi
+
# enable the cld workaround until we move things to stable.
# by that point, the rest of the software out there should
# have caught up.
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2008-10-24 7:30 Joshua Kinard (kumba)
0 siblings, 0 replies; 266+ messages in thread
From: Joshua Kinard (kumba) @ 2008-10-24 7:30 UTC (permalink / raw
To: gentoo-commits
kumba 08/10/24 07:30:35
Modified: toolchain.eclass
Log:
Add a configure switch for gcc-4.3's fixed-point arithmetic support for MIPS targets, as enabling this support lengthens gcc's compile time by several hours, depending on the machine.
Revision Changes Path
1.364 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.364&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.364&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.363&r2=1.364
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.363
retrieving revision 1.364
diff -u -r1.363 -r1.364
--- toolchain.eclass 20 Oct 2008 01:04:38 -0000 1.363
+++ toolchain.eclass 24 Oct 2008 07:30:35 -0000 1.364
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.363 2008/10/20 01:04:38 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.364 2008/10/24 07:30:35 kumba Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -155,6 +155,7 @@
tc_version_is_at_least "4.0" && IUSE="${IUSE} objc-gc mudflap"
tc_version_is_at_least "4.1" && IUSE="${IUSE} objc++"
tc_version_is_at_least "4.2" && IUSE="${IUSE} openmp"
+ tc_version_is_at_least "4.3" && IUSE="${IUSE} fixed-point"
fi
fi
@@ -1266,6 +1267,12 @@
# ppc altivec support
confgcc="${confgcc} $(use_enable altivec)"
+ # gcc has fixed-point arithmetic support in 4.3 for mips targets that can
+ # significantly increase compile time by several hours. This will allow
+ # users to control this feature in the event they need the support.
+ tc_version_is_at_least "4.3" && confgcc="${confgcc} $(use_enable fixed-point)"
+
+
[[ $(tc-is-softfloat) == "yes" ]] && confgcc="${confgcc} --with-float=soft"
# Native Language Support
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2008-11-09 20:27 Ned Ludd (solar)
0 siblings, 0 replies; 266+ messages in thread
From: Ned Ludd (solar) @ 2008-11-09 20:27 UTC (permalink / raw
To: gentoo-commits
solar 08/11/09 20:27:43
Modified: toolchain.eclass
Log:
- unbreak arm eabi support
Revision Changes Path
1.366 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.366&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.366&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.365&r2=1.366
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.365
retrieving revision 1.366
diff -u -r1.365 -r1.366
--- toolchain.eclass 27 Oct 2008 05:06:41 -0000 1.365
+++ toolchain.eclass 9 Nov 2008 20:27:43 -0000 1.366
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.365 2008/10/27 05:06:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.366 2008/11/09 20:27:43 solar Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1016,6 +1016,15 @@
die "Failed to fixup file ${jfile} for rename to grmic"
done
}
+unbreak_arm() {
+ [[ ${CTARGET} == *eabi* ]] || return
+ [[ ${CTARGET} == arm* ]] || return
+ [[ ${CTARGET} == armv5* ]] && return
+ [[ -e "${S}"/gcc/config/arm/linux-eabi.h ]] || return
+ #armv4tl can do ebai as well. http://www.nabble.com/Re:--crosstool-ng--ARM-EABI-problem-p17164547.html
+ #http://sourceware.org/ml/crossgcc/2008-05/msg00009.html
+ sed -i -e s/'define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi'/'define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi'/g "${S}"/gcc/config/arm/linux-eabi.h
+}
gcc_src_unpack() {
export BRANDING_GCC_PKGVERSION="Gentoo ${GCC_PVR}"
@@ -1099,6 +1108,8 @@
do_gcc_rename_java_bins
fi
+ unbreak_arm
+
# Fixup libtool to correctly generate .la files with portage
cd "${S}"
elibtoolize --portage --shallow --no-uclibc
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2008-11-28 9:20 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2008-11-28 9:20 UTC (permalink / raw
To: gentoo-commits
vapier 08/11/28 09:20:35
Modified: toolchain.eclass
Log:
add cygwin targets
Revision Changes Path
1.367 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.367&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.367&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.366&r2=1.367
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.366
retrieving revision 1.367
diff -u -r1.366 -r1.367
--- toolchain.eclass 9 Nov 2008 20:27:43 -0000 1.366
+++ toolchain.eclass 28 Nov 2008 09:20:34 -0000 1.367
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.366 2008/11/09 20:27:43 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.367 2008/11/28 09:20:34 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1321,6 +1321,7 @@
*-gnu*) needed_libc=glibc;;
*-klibc) needed_libc=klibc;;
*-uclibc*) needed_libc=uclibc;;
+ *-cygwin) needed_libc=cygwin;;
mingw*|*-mingw*) needed_libc=mingw-runtime;;
avr) confgcc="${confgcc} --enable-shared --disable-threads";;
esac
@@ -1337,7 +1338,7 @@
if [[ ${GCCMAJOR}.${GCCMINOR} > 4.1 ]] ; then
confgcc="${confgcc} --disable-bootstrap --disable-libgomp"
fi
- elif [[ ${CHOST} == mingw* ]] || [[ ${CHOST} == *-mingw* ]] ; then
+ elif [[ ${CHOST} == mingw* ]] || [[ ${CHOST} == *-mingw* ]] || [[ ${CHOST} == *-cygwin ]] ; then
confgcc="${confgcc} --enable-shared --enable-threads=win32"
else
confgcc="${confgcc} --enable-shared --enable-threads=posix"
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2008-12-22 18:53 Ned Ludd (solar)
0 siblings, 0 replies; 266+ messages in thread
From: Ned Ludd (solar) @ 2008-12-22 18:53 UTC (permalink / raw
To: gentoo-commits
solar 08/12/22 18:53:47
Modified: toolchain.eclass
Log:
- start getting eclass ready for gcc:4
Revision Changes Path
1.368 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.368&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.368&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.367&r2=1.368
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.367
retrieving revision 1.368
diff -u -r1.367 -r1.368
--- toolchain.eclass 28 Nov 2008 09:20:34 -0000 1.367
+++ toolchain.eclass 22 Dec 2008 18:53:47 -0000 1.368
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.367 2008/11/28 09:20:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.368 2008/12/22 18:53:47 solar Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -2127,17 +2127,23 @@
use vanilla && rm -f "${WORKDIR}"/piepatch/*/*uclibc*
- guess_patch_type_in_dir "${WORKDIR}"/piepatch/upstream
-
- # corrects startfile/endfile selection and shared/static/pie flag usage
- EPATCH_MULTI_MSG="Applying upstream pie patches ..." \
- epatch "${WORKDIR}"/piepatch/upstream
- # adds non-default pie support (rs6000)
- EPATCH_MULTI_MSG="Applying non-default pie patches ..." \
- epatch "${WORKDIR}"/piepatch/nondef
- # adds default pie support (rs6000 too) if DEFAULT_PIE[_SSP] is defined
- EPATCH_MULTI_MSG="Applying default pie patches ..." \
- epatch "${WORKDIR}"/piepatch/def
+ if tc_version_is_at_least 4.3.2; then
+ guess_patch_type_in_dir "${WORKDIR}"/piepatch/
+ EPATCH_MULTI_MSG="Applying pie patches ..." \
+ epatch "${WORKDIR}"/piepatch/
+ else
+ guess_patch_type_in_dir "${WORKDIR}"/piepatch/upstream
+
+ # corrects startfile/endfile selection and shared/static/pie flag usage
+ EPATCH_MULTI_MSG="Applying upstream pie patches ..." \
+ epatch "${WORKDIR}"/piepatch/upstream
+ # adds non-default pie support (rs6000)
+ EPATCH_MULTI_MSG="Applying non-default pie patches ..." \
+ epatch "${WORKDIR}"/piepatch/nondef
+ # adds default pie support (rs6000 too) if DEFAULT_PIE[_SSP] is defined
+ EPATCH_MULTI_MSG="Applying default pie patches ..." \
+ epatch "${WORKDIR}"/piepatch/def
+ fi
# we want to be able to control the pie patch logic via something other
# than ALL_CFLAGS...
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2008-12-29 2:24 Ned Ludd (solar)
0 siblings, 0 replies; 266+ messages in thread
From: Ned Ludd (solar) @ 2008-12-29 2:24 UTC (permalink / raw
To: gentoo-commits
solar 08/12/29 02:24:19
Modified: toolchain.eclass
Log:
- import gcc:4 pie support towards hardened-gcc. (many thanks to Zorry for putting up with all my crazy requirements)
Revision Changes Path
1.369 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.369&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.369&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.368&r2=1.369
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.368
retrieving revision 1.369
diff -u -r1.368 -r1.369
--- toolchain.eclass 22 Dec 2008 18:53:47 -0000 1.368
+++ toolchain.eclass 29 Dec 2008 02:24:18 -0000 1.369
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.368 2008/12/22 18:53:47 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.369 2008/12/29 02:24:18 solar Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -236,6 +236,10 @@
# old syntax (do not define PIE_CORE anymore):
# PIE_CORE="gcc-3.4.0-piepatches-v${PIE_VER}.tar.bz2"
#
+# SPECS_VER
+# SPECS_GCC_VER
+# This is for the minispecs files included in the hardened gcc-4.x
+#
# PP_VER
# PP_GCC_VER
# obsoleted: PP_FVER
@@ -280,6 +284,7 @@
export PIE_GCC_VER=${PIE_GCC_VER:-${GCC_RELEASE_VER}}
export PP_GCC_VER=${PP_GCC_VER:-${GCC_RELEASE_VER}}
export HTB_GCC_VER=${HTB_GCC_VER:-${GCC_RELEASE_VER}}
+ export SPECS_GCC_VER=${SPECS_GCC_VER:-${GCC_RELEASE_VER}}
[[ -n ${PIE_VER} ]] && \
PIE_CORE=${PIE_CORE:-gcc-${PIE_GCC_VER}-piepatches-v${PIE_VER}.tar.bz2}
@@ -327,6 +332,10 @@
[[ -n ${PIE_VER} ]] && \
GCC_SRC_URI="${GCC_SRC_URI} !nopie? ( $(gentoo_urls ${PIE_CORE}) )"
+ # gcc minispec for the hardened gcc 4 compiler
+ [[ -n ${SPECS_VER} ]] && \
+ GCC_SRC_URI="${GCC_SRC_URI} !nopie? ( $(gentoo_urls gcc-${SPECS_GCC_VER}-default-specs-${SPECS_VER}.tar.bz2) )"
+
# gcc bounds checking patch
if [[ -n ${HTB_VER} ]] ; then
local HTBFILE="bounds-checking-gcc-${HTB_GCC_VER}-${HTB_VER}.patch.bz2"
@@ -483,7 +492,16 @@
want_split_specs() {
[[ ${SPLIT_SPECS} == "true" ]] && want_pie
}
-
+want_minispecs() {
+ if tc_version_is_at_least 4.3.2 && use hardened ; then
+ if [[ -n ${SPECS_VER} ]] ; then
+ return 0
+ else
+ die "For Hardend to work you need the minispecs files"
+ fi
+ fi
+ return 1
+}
# This function checks whether or not glibc has the support required to build
# Position Independant Executables with gcc.
glibc_have_pie() {
@@ -685,7 +703,29 @@
# Set which specs file to use
[[ -n ${gcc_specs_file} ]] && echo "GCC_SPECS=\"${gcc_specs_file}\"" >> ${gcc_envd_file}
}
-
+setup_minispecs_gcc_build_specs() {
+ # Setup the "build.specs" file for gcc to use when building.
+ if want_minispecs ; then
+ if hardened_gcc_works pie ; then
+ cat "${WORKDIR}"/specs/pie.specs >> "${WORKDIR}"/build.specs
+ fi
+ for s in nostrict znow zrelro; do
+ cat "${WORKDIR}"/specs/${s}.specs >> "${WORKDIR}"/build.specs
+ done
+ export GCC_SPECS="${WORKDIR}"/build.specs
+ fi
+}
+copy_minispecs_gcc_specs() {
+ # Build system specs file which, if it exists, must be a complete set of
+ # specs as it completely and unconditionally overrides the builtin specs.
+ # For gcc 4
+ if use hardened && want_minispecs ; then
+ $(XGCC) -dumpspecs > "${WORKDIR}"/specs/specs
+ cat "${WORKDIR}"/build.specs >> "${WORKDIR}"/specs/specs
+ insinto ${LIBPATH}
+ doins "${WORKDIR}"/specs/* || die "failed to install specs"
+ fi
+}
add_profile_eselect_conf() {
local compiler_config_file=$1
local abi=$2
@@ -961,7 +1001,7 @@
# the necessary support
want_pie && use hardened && glibc_have_pie
- if use hardened ; then
+ if use hardened && !want_minispecs ; then
einfo "updating configuration to build hardened GCC"
make_gcc_hard || die "failed to make gcc hard"
fi
@@ -1585,6 +1625,9 @@
einfo "CFLAGS=\"${CFLAGS}\""
einfo "CXXFLAGS=\"${CXXFLAGS}\""
+ # For hardened gcc 4 for build the hardened specs file to use when building gcc
+ setup_minispecs_gcc_build_specs
+
# Build in a separate build tree
mkdir -p "${WORKDIR}"/build
pushd "${WORKDIR}"/build > /dev/null
@@ -1607,7 +1650,7 @@
# Do not create multiple specs files for PIE+SSP if boundschecking is in
# USE, as we disable PIE+SSP when it is.
- if [[ ${ETYPE} == "gcc-compiler" ]] && want_split_specs ; then
+ if [[ ${ETYPE} == "gcc-compiler" ]] && want_split_specs && !want_minispecs; then
split_out_specs_files || die "failed to split out specs"
fi
@@ -1711,7 +1754,13 @@
insinto ${LIBPATH}
doins "${WORKDIR}"/build/*.specs || die "failed to install specs"
fi
-
+ # Setup the gcc_env_entry for hardened gcc 4 with minispecs
+ if want_minispecs ; then
+ if hardened_gcc_works pie ; then
+ create_gcc_env_entry hardenednopie
+ fi
+ create_gcc_env_entry vanilla
+ fi
# Make sure we dont have stuff lying around that
# can nuke multiple versions of gcc
cd "${D}"${LIBPATH}
@@ -1839,6 +1888,9 @@
# Create config files for eselect-compiler
create_eselect_conf
+
+ # Cpoy the needed minispec for hardened gcc 4
+ copy_minispecs_gcc_specs
}
# Move around the libs to the right location. For some reason,
@@ -1909,6 +1961,7 @@
export PIE_GCC_VER=${PIE_GCC_VER:-${GCC_RELEASE_VER}}
export PP_GCC_VER=${PP_GCC_VER:-${GCC_RELEASE_VER}}
export HTB_GCC_VER=${HTB_GCC_VER:-${GCC_RELEASE_VER}}
+ export SPECS_GCC_VER=${SPECS_GCC_VER:-${GCC_RELEASE_VER}}
if [[ -n ${GCC_A_FAKEIT} ]] ; then
unpack ${GCC_A_FAKEIT}
@@ -1964,6 +2017,8 @@
else
unpack gcc-${PIE_GCC_VER}-piepatches-v${PIE_VER}.tar.bz2
fi
+ [[ -n ${SPECS_VER} ]] && \
+ unpack gcc-${SPECS_GCC_VER}-default-specs-${SPECS_VER}.tar.bz2
fi
want_boundschecking && \
@@ -2143,13 +2198,13 @@
# adds default pie support (rs6000 too) if DEFAULT_PIE[_SSP] is defined
EPATCH_MULTI_MSG="Applying default pie patches ..." \
epatch "${WORKDIR}"/piepatch/def
- fi
- # we want to be able to control the pie patch logic via something other
- # than ALL_CFLAGS...
- sed -e '/^ALL_CFLAGS/iHARD_CFLAGS = ' \
- -e 's|^ALL_CFLAGS = |ALL_CFLAGS = $(HARD_CFLAGS) |' \
- -i "${S}"/gcc/Makefile.in
+ # we want to be able to control the pie patch logic via something other
+ # than ALL_CFLAGS...
+ sed -e '/^ALL_CFLAGS/iHARD_CFLAGS = ' \
+ -e 's|^ALL_CFLAGS = |ALL_CFLAGS = $(HARD_CFLAGS) |' \
+ -i "${S}"/gcc/Makefile.in
+ fi
BRANDING_GCC_PKGVERSION="${BRANDING_GCC_PKGVERSION}, pie-${PIE_VER}"
}
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2008-12-29 16:40 Raul Porcel (armin76)
0 siblings, 0 replies; 266+ messages in thread
From: Raul Porcel (armin76) @ 2008-12-29 16:40 UTC (permalink / raw
To: gentoo-commits
armin76 08/12/29 16:40:54
Modified: toolchain.eclass
Log:
Typo fixes, as pointed out by Zorry
Revision Changes Path
1.370 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.370&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.370&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.369&r2=1.370
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.369
retrieving revision 1.370
diff -u -r1.369 -r1.370
--- toolchain.eclass 29 Dec 2008 02:24:18 -0000 1.369
+++ toolchain.eclass 29 Dec 2008 16:40:54 -0000 1.370
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.369 2008/12/29 02:24:18 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.370 2008/12/29 16:40:54 armin76 Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1001,7 +1001,7 @@
# the necessary support
want_pie && use hardened && glibc_have_pie
- if use hardened && !want_minispecs ; then
+ if use hardened && ! want_minispecs ; then
einfo "updating configuration to build hardened GCC"
make_gcc_hard || die "failed to make gcc hard"
fi
@@ -1650,7 +1650,7 @@
# Do not create multiple specs files for PIE+SSP if boundschecking is in
# USE, as we disable PIE+SSP when it is.
- if [[ ${ETYPE} == "gcc-compiler" ]] && want_split_specs && !want_minispecs; then
+ if [[ ${ETYPE} == "gcc-compiler" ]] && want_split_specs && ! want_minispecs; then
split_out_specs_files || die "failed to split out specs"
fi
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2008-12-29 22:46 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2008-12-29 22:46 UTC (permalink / raw
To: gentoo-commits
vapier 08/12/29 22:46:32
Modified: toolchain.eclass
Log:
drop support for profiledbootstrap building ... it breaks too often with things
Revision Changes Path
1.371 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.371&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.371&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.370&r2=1.371
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.370
retrieving revision 1.371
diff -u -r1.370 -r1.371
--- toolchain.eclass 29 Dec 2008 16:40:54 -0000 1.370
+++ toolchain.eclass 29 Dec 2008 22:46:32 -0000 1.371
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.370 2008/12/29 16:40:54 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.371 2008/12/29 22:46:32 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1468,10 +1468,6 @@
# 3 stage bootstrapping doesnt quite work when you cant run the
# resulting binaries natively ^^;
GCC_MAKE_TARGET=${GCC_MAKE_TARGET-all}
- elif [[ $(tc-arch) == "x86" || $(tc-arch) == "amd64" ]] \
- && [[ ${GCCMAJOR}.${GCCMINOR} > 3.3 ]]
- then
- GCC_MAKE_TARGET=${GCC_MAKE_TARGET-profiledbootstrap}
else
GCC_MAKE_TARGET=${GCC_MAKE_TARGET-bootstrap-lean}
fi
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2008-12-31 21:26 Ned Ludd (solar)
0 siblings, 0 replies; 266+ messages in thread
From: Ned Ludd (solar) @ 2008-12-31 21:26 UTC (permalink / raw
To: gentoo-commits
solar 08/12/31 21:26:11
Modified: toolchain.eclass
Log:
s/default-specs/specs/
Revision Changes Path
1.372 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.372&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.372&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.371&r2=1.372
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.371
retrieving revision 1.372
diff -u -r1.371 -r1.372
--- toolchain.eclass 29 Dec 2008 22:46:32 -0000 1.371
+++ toolchain.eclass 31 Dec 2008 21:26:11 -0000 1.372
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.371 2008/12/29 22:46:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.372 2008/12/31 21:26:11 solar Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -334,7 +334,7 @@
# gcc minispec for the hardened gcc 4 compiler
[[ -n ${SPECS_VER} ]] && \
- GCC_SRC_URI="${GCC_SRC_URI} !nopie? ( $(gentoo_urls gcc-${SPECS_GCC_VER}-default-specs-${SPECS_VER}.tar.bz2) )"
+ GCC_SRC_URI="${GCC_SRC_URI} !nopie? ( $(gentoo_urls gcc-${SPECS_GCC_VER}-specs-${SPECS_VER}.tar.bz2) )"
# gcc bounds checking patch
if [[ -n ${HTB_VER} ]] ; then
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2009-01-01 6:26 Gordon Malm (gengor)
0 siblings, 0 replies; 266+ messages in thread
From: Gordon Malm (gengor) @ 2009-01-01 6:26 UTC (permalink / raw
To: gentoo-commits
gengor 09/01/01 06:26:11
Modified: toolchain.eclass
Log:
Fix broken gcc specs unpack
Revision Changes Path
1.373 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.373&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.373&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.372&r2=1.373
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.372
retrieving revision 1.373
diff -u -r1.372 -r1.373
--- toolchain.eclass 31 Dec 2008 21:26:11 -0000 1.372
+++ toolchain.eclass 1 Jan 2009 06:26:11 -0000 1.373
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.372 2008/12/31 21:26:11 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.373 2009/01/01 06:26:11 gengor Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -2014,7 +2014,7 @@
unpack gcc-${PIE_GCC_VER}-piepatches-v${PIE_VER}.tar.bz2
fi
[[ -n ${SPECS_VER} ]] && \
- unpack gcc-${SPECS_GCC_VER}-default-specs-${SPECS_VER}.tar.bz2
+ unpack gcc-${SPECS_GCC_VER}-specs-${SPECS_VER}.tar.bz2
fi
want_boundschecking && \
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2009-01-02 0:09 Ned Ludd (solar)
0 siblings, 0 replies; 266+ messages in thread
From: Ned Ludd (solar) @ 2009-01-02 0:09 UTC (permalink / raw
To: gentoo-commits
solar 09/01/02 00:09:43
Modified: toolchain.eclass
Log:
- relro is no longer needed in specs as it is a default
Revision Changes Path
1.374 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.374&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.374&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.373&r2=1.374
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.373
retrieving revision 1.374
diff -u -r1.373 -r1.374
--- toolchain.eclass 1 Jan 2009 06:26:11 -0000 1.373
+++ toolchain.eclass 2 Jan 2009 00:09:43 -0000 1.374
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.373 2009/01/01 06:26:11 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.374 2009/01/02 00:09:43 solar Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -709,7 +709,7 @@
if hardened_gcc_works pie ; then
cat "${WORKDIR}"/specs/pie.specs >> "${WORKDIR}"/build.specs
fi
- for s in nostrict znow zrelro; do
+ for s in nostrict znow; do
cat "${WORKDIR}"/specs/${s}.specs >> "${WORKDIR}"/build.specs
done
export GCC_SPECS="${WORKDIR}"/build.specs
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2009-01-04 17:17 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2009-01-04 17:17 UTC (permalink / raw
To: gentoo-commits
vapier 09/01/04 17:17:54
Modified: toolchain.eclass
Log:
revert arm sed junk ... this needs to be a patch, not sed in the toolchain.eclass
Revision Changes Path
1.375 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.375&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.375&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.374&r2=1.375
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.374
retrieving revision 1.375
diff -u -r1.374 -r1.375
--- toolchain.eclass 2 Jan 2009 00:09:43 -0000 1.374
+++ toolchain.eclass 4 Jan 2009 17:17:54 -0000 1.375
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.374 2009/01/02 00:09:43 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.375 2009/01/04 17:17:54 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1056,15 +1056,6 @@
die "Failed to fixup file ${jfile} for rename to grmic"
done
}
-unbreak_arm() {
- [[ ${CTARGET} == *eabi* ]] || return
- [[ ${CTARGET} == arm* ]] || return
- [[ ${CTARGET} == armv5* ]] && return
- [[ -e "${S}"/gcc/config/arm/linux-eabi.h ]] || return
- #armv4tl can do ebai as well. http://www.nabble.com/Re:--crosstool-ng--ARM-EABI-problem-p17164547.html
- #http://sourceware.org/ml/crossgcc/2008-05/msg00009.html
- sed -i -e s/'define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi'/'define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi'/g "${S}"/gcc/config/arm/linux-eabi.h
-}
gcc_src_unpack() {
export BRANDING_GCC_PKGVERSION="Gentoo ${GCC_PVR}"
@@ -1148,8 +1139,6 @@
do_gcc_rename_java_bins
fi
- unbreak_arm
-
# Fixup libtool to correctly generate .la files with portage
cd "${S}"
elibtoolize --portage --shallow --no-uclibc
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2009-01-05 22:02 Ned Ludd (solar)
0 siblings, 0 replies; 266+ messages in thread
From: Ned Ludd (solar) @ 2009-01-05 22:02 UTC (permalink / raw
To: gentoo-commits
solar 09/01/05 22:02:12
Modified: toolchain.eclass
Log:
- vapier I don't care if you do not like a sed statement or not. Do not revert legit fixes to the tree simply cuz you do no like them without infoming anybody. That is tree abuse. If something bothers you then you come up with the patches for all 20 gcc's
Revision Changes Path
1.376 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.376&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.376&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.375&r2=1.376
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.375
retrieving revision 1.376
diff -u -r1.375 -r1.376
--- toolchain.eclass 4 Jan 2009 17:17:54 -0000 1.375
+++ toolchain.eclass 5 Jan 2009 22:02:12 -0000 1.376
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.375 2009/01/04 17:17:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.376 2009/01/05 22:02:12 solar Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1056,6 +1056,15 @@
die "Failed to fixup file ${jfile} for rename to grmic"
done
}
+unbreak_arm() {
+ [[ ${CTARGET} == *eabi* ]] || return
+ [[ ${CTARGET} == arm* ]] || return
+ [[ ${CTARGET} == armv5* ]] && return
+ [[ -e "${S}"/gcc/config/arm/linux-eabi.h ]] || return
+ #armv4tl can do ebai as well. http://www.nabble.com/Re:--crosstool-ng--ARM-EABI-problem-p17164547.html
+ #http://sourceware.org/ml/crossgcc/2008-05/msg00009.html
+ sed -i -e s/'define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi'/'define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi'/g "${S}"/gcc/config/arm/linux-eabi.h
+}
gcc_src_unpack() {
export BRANDING_GCC_PKGVERSION="Gentoo ${GCC_PVR}"
@@ -1139,6 +1148,8 @@
do_gcc_rename_java_bins
fi
+ unbreak_arm
+
# Fixup libtool to correctly generate .la files with portage
cd "${S}"
elibtoolize --portage --shallow --no-uclibc
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2009-01-06 3:49 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2009-01-06 3:49 UTC (permalink / raw
To: gentoo-commits
vapier 09/01/06 03:49:02
Modified: toolchain.eclass
Log:
use emake in src_test
Revision Changes Path
1.377 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.377&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.377&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.376&r2=1.377
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.376
retrieving revision 1.377
diff -u -r1.376 -r1.377
--- toolchain.eclass 5 Jan 2009 22:02:12 -0000 1.376
+++ toolchain.eclass 6 Jan 2009 03:49:02 -0000 1.377
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.376 2009/01/05 22:02:12 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.377 2009/01/06 03:49:02 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1655,7 +1655,7 @@
gcc_src_test() {
cd "${WORKDIR}"/build
- make -k check || ewarn "check failed and that sucks :("
+ emake -j1 -k check || ewarn "check failed and that sucks :("
}
gcc-library_src_install() {
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2009-01-06 3:53 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2009-01-06 3:53 UTC (permalink / raw
To: gentoo-commits
vapier 09/01/06 03:53:24
Modified: toolchain.eclass
Log:
we arent going to have a commit war -- get a patch in
Revision Changes Path
1.378 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.378&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.378&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.377&r2=1.378
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.377
retrieving revision 1.378
diff -u -r1.377 -r1.378
--- toolchain.eclass 6 Jan 2009 03:49:02 -0000 1.377
+++ toolchain.eclass 6 Jan 2009 03:53:24 -0000 1.378
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.377 2009/01/06 03:49:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.378 2009/01/06 03:53:24 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1056,15 +1056,6 @@
die "Failed to fixup file ${jfile} for rename to grmic"
done
}
-unbreak_arm() {
- [[ ${CTARGET} == *eabi* ]] || return
- [[ ${CTARGET} == arm* ]] || return
- [[ ${CTARGET} == armv5* ]] && return
- [[ -e "${S}"/gcc/config/arm/linux-eabi.h ]] || return
- #armv4tl can do ebai as well. http://www.nabble.com/Re:--crosstool-ng--ARM-EABI-problem-p17164547.html
- #http://sourceware.org/ml/crossgcc/2008-05/msg00009.html
- sed -i -e s/'define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi'/'define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi'/g "${S}"/gcc/config/arm/linux-eabi.h
-}
gcc_src_unpack() {
export BRANDING_GCC_PKGVERSION="Gentoo ${GCC_PVR}"
@@ -1148,8 +1139,6 @@
do_gcc_rename_java_bins
fi
- unbreak_arm
-
# Fixup libtool to correctly generate .la files with portage
cd "${S}"
elibtoolize --portage --shallow --no-uclibc
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2009-01-10 12:02 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2009-01-10 12:02 UTC (permalink / raw
To: gentoo-commits
vapier 09/01/10 12:02:56
Modified: toolchain.eclass
Log:
drop old libstdc++ i386 hack #235181
Revision Changes Path
1.379 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.379&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.379&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.378&r2=1.379
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.378
retrieving revision 1.379
diff -u -r1.378 -r1.379
--- toolchain.eclass 6 Jan 2009 03:53:24 -0000 1.378
+++ toolchain.eclass 10 Jan 2009 12:02:56 -0000 1.379
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.378 2009/01/06 03:53:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.379 2009/01/10 12:02:56 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1110,11 +1110,6 @@
fi
fi
- # Misdesign in libstdc++ (Redhat)
- if [[ ${GCCMAJOR} -ge 3 ]] && [[ -e ${S}/libstdc++-v3/config/cpu/i486/atomicity.h ]] ; then
- cp -pPR "${S}"/libstdc++-v3/config/cpu/i{4,3}86/atomicity.h
- fi
-
# >= gcc-4.3 doesn't bundle ecj.jar, so copy it
if [[ ${GCCMAJOR}.${GCCMINOR} > 4.2 ]] &&
use gcj ; then
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2009-01-10 12:53 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2009-01-10 12:53 UTC (permalink / raw
To: gentoo-commits
vapier 09/01/10 12:53:50
Modified: toolchain.eclass
Log:
add support for user /etc/portage/patches/
Revision Changes Path
1.380 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.380&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.380&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.379&r2=1.380
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.379
retrieving revision 1.380
diff -u -r1.379 -r1.380
--- toolchain.eclass 10 Jan 2009 12:02:56 -0000 1.379
+++ toolchain.eclass 10 Jan 2009 12:53:50 -0000 1.380
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.379 2009/01/10 12:02:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.380 2009/01/10 12:53:50 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1082,6 +1082,7 @@
do_gcc_HTB_patches
do_gcc_SSP_patches
do_gcc_PIE_patches
+ do_gcc_USER_patches
${ETYPE}_src_unpack || die "failed to ${ETYPE}_src_unpack"
@@ -2047,6 +2048,22 @@
done
}
+do_gcc_USER_patches() {
+ local check base=${PORTAGE_CONFIGROOT}/etc/portage/patches
+ for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
+ EPATCH_SOURCE=${base}/${CTARGET}/${check}
+ [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
+ [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}
+ if [[ -d ${EPATCH_SOURCE} ]] ; then
+ EPATCH_SUFFIX="patch"
+ EPATCH_FORCE="yes" \
+ EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
+ epatch
+ break
+ fi
+ done
+}
+
do_gcc_HTB_patches() {
if ! want_boundschecking || \
(want_ssp && [[ ${HTB_EXCLUSIVE} == "true" ]])
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2009-01-12 22:51 Markus Meier (maekke)
0 siblings, 0 replies; 266+ messages in thread
From: Markus Meier (maekke) @ 2009-01-12 22:51 UTC (permalink / raw
To: gentoo-commits
maekke 09/01/12 22:51:38
Modified: toolchain.eclass
Log:
whitespace
Revision Changes Path
1.381 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.381&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.381&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.380&r2=1.381
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.380
retrieving revision 1.381
diff -u -r1.380 -r1.381
--- toolchain.eclass 10 Jan 2009 12:53:50 -0000 1.380
+++ toolchain.eclass 12 Jan 2009 22:51:38 -0000 1.381
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.380 2009/01/10 12:53:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.381 2009/01/12 22:51:38 maekke Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -333,8 +333,8 @@
GCC_SRC_URI="${GCC_SRC_URI} !nopie? ( $(gentoo_urls ${PIE_CORE}) )"
# gcc minispec for the hardened gcc 4 compiler
- [[ -n ${SPECS_VER} ]] && \
- GCC_SRC_URI="${GCC_SRC_URI} !nopie? ( $(gentoo_urls gcc-${SPECS_GCC_VER}-specs-${SPECS_VER}.tar.bz2) )"
+ [[ -n ${SPECS_VER} ]] && \
+ GCC_SRC_URI="${GCC_SRC_URI} !nopie? ( $(gentoo_urls gcc-${SPECS_GCC_VER}-specs-${SPECS_VER}.tar.bz2) )"
# gcc bounds checking patch
if [[ -n ${HTB_VER} ]] ; then
@@ -707,7 +707,7 @@
# Setup the "build.specs" file for gcc to use when building.
if want_minispecs ; then
if hardened_gcc_works pie ; then
- cat "${WORKDIR}"/specs/pie.specs >> "${WORKDIR}"/build.specs
+ cat "${WORKDIR}"/specs/pie.specs >> "${WORKDIR}"/build.specs
fi
for s in nostrict znow; do
cat "${WORKDIR}"/specs/${s}.specs >> "${WORKDIR}"/build.specs
@@ -724,7 +724,7 @@
cat "${WORKDIR}"/build.specs >> "${WORKDIR}"/specs/specs
insinto ${LIBPATH}
doins "${WORKDIR}"/specs/* || die "failed to install specs"
- fi
+ fi
}
add_profile_eselect_conf() {
local compiler_config_file=$1
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2009-01-28 2:27 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2009-01-28 2:27 UTC (permalink / raw
To: gentoo-commits
vapier 09/01/28 02:27:02
Modified: toolchain.eclass
Log:
split java crap into its own gcc_slot_java and start slotting libgcj.pc #136382 #216241
Revision Changes Path
1.382 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.382&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.382&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.381&r2=1.382
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.381
retrieving revision 1.382
diff -u -r1.381 -r1.382
--- toolchain.eclass 12 Jan 2009 22:51:38 -0000 1.381
+++ toolchain.eclass 28 Jan 2009 02:27:01 -0000 1.382
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.381 2009/01/12 22:51:38 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.382 2009/01/28 02:27:01 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1744,34 +1744,8 @@
fi
# Make sure we dont have stuff lying around that
# can nuke multiple versions of gcc
- cd "${D}"${LIBPATH}
- # Move Java headers to compiler-specific dir
- for x in "${D}"${PREFIX}/include/gc*.h "${D}"${PREFIX}/include/j*.h ; do
- [[ -f ${x} ]] && mv -f "${x}" "${D}"${LIBPATH}/include/
- done
- for x in gcj gnu java javax org ; do
- if [[ -d ${D}${PREFIX}/include/${x} ]] ; then
- dodir /${LIBPATH}/include/${x}
- mv -f "${D}"${PREFIX}/include/${x}/* "${D}"${LIBPATH}/include/${x}/
- rm -rf "${D}"${PREFIX}/include/${x}
- fi
- done
-
- if [[ -d ${D}${PREFIX}/lib/security ]] ; then
- dodir /${LIBPATH}/security
- mv -f "${D}"${PREFIX}/lib/security/* "${D}"${LIBPATH}/security
- rm -rf "${D}"${PREFIX}/lib/security
- fi
-
- # Move libgcj.spec to compiler-specific directories
- [[ -f ${D}${PREFIX}/lib/libgcj.spec ]] && \
- mv -f "${D}"${PREFIX}/lib/libgcj.spec "${D}"${LIBPATH}/libgcj.spec
-
- # Rename jar because it could clash with Kaffe's jar if this gcc is
- # primary compiler (aka don't have the -<version> extension)
- cd "${D}"${BINPATH}
- [[ -f jar ]] && mv -f jar gcj-jar
+ gcc_slot_java
# Move <cxxabi.h> to compiler-specific directories
[[ -f ${D}${STDCXX_INCDIR}/cxxabi.h ]] && \
@@ -1874,6 +1848,44 @@
copy_minispecs_gcc_specs
}
+gcc_slot_java() {
+ local x
+
+ # Move Java headers to compiler-specific dir
+ for x in "${D}"${PREFIX}/include/gc*.h "${D}"${PREFIX}/include/j*.h ; do
+ [[ -f ${x} ]] && mv -f "${x}" "${D}"${LIBPATH}/include/
+ done
+ for x in gcj gnu java javax org ; do
+ if [[ -d ${D}${PREFIX}/include/${x} ]] ; then
+ dodir /${LIBPATH}/include/${x}
+ mv -f "${D}"${PREFIX}/include/${x}/* "${D}"${LIBPATH}/include/${x}/
+ rm -rf "${D}"${PREFIX}/include/${x}
+ fi
+ done
+
+ if [[ -d ${D}${PREFIX}/lib/security ]] || [[ -d ${D}${PREFIX}/$(get_libdir)/security ]] ; then
+ dodir /${LIBPATH}/security
+ mv -f "${D}"${PREFIX}/lib*/security/* "${D}"${LIBPATH}/security
+ rm -rf "${D}"${PREFIX}/lib*/security
+ fi
+
+ # Move libgcj.spec to compiler-specific directories
+ [[ -f ${D}${PREFIX}/lib/libgcj.spec ]] && \
+ mv -f "${D}"${PREFIX}/lib/libgcj.spec "${D}"${LIBPATH}/libgcj.spec
+
+ # SLOT up libgcj.pc (and let gcc-config worry about links)
+ local libgcj=$(find "${D}"${PREFIX}/lib/pkgconfig/ -name 'libgcj*.pc')
+ if [[ -n ${libgcj} ]] ; then
+ sed -i "/^libdir=/s:=.*:=${LIBPATH}:" "${libgcj}"
+ mv "${libgcj}" "${D}"/usr/lib/pkgconfig/libgcj-${GCC_PV}.pc || die
+ fi
+
+ # Rename jar because it could clash with Kaffe's jar if this gcc is
+ # primary compiler (aka don't have the -<version> extension)
+ cd "${D}"${BINPATH}
+ [[ -f jar ]] && mv -f jar gcj-jar
+}
+
# Move around the libs to the right location. For some reason,
# when installing gcc, it dumps internal libraries into /usr/lib
# instead of the private gcc lib path
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2009-01-28 4:29 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2009-01-28 4:29 UTC (permalink / raw
To: gentoo-commits
vapier 09/01/28 04:29:52
Modified: toolchain.eclass
Log:
use -prune when searching for a dir to delete to avoid harmless warnings about find not being able to descend into the dir
Revision Changes Path
1.383 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.383&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.383&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.382&r2=1.383
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.382
retrieving revision 1.383
diff -u -r1.382 -r1.383
--- toolchain.eclass 28 Jan 2009 02:27:01 -0000 1.382
+++ toolchain.eclass 28 Jan 2009 04:29:52 -0000 1.383
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.382 2009/01/28 02:27:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.383 2009/01/28 04:29:52 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1702,7 +1702,7 @@
S=${WORKDIR}/build \
make DESTDIR="${D}" install || die
# Punt some tools which are really only useful while building gcc
- find "${D}" -name install-tools -type d -exec rm -rf "{}" \;
+ find "${D}" -name install-tools -prune -type d -exec rm -rf "{}" \;
# This one comes with binutils
find "${D}" -name libiberty.a -exec rm -f "{}" \;
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2009-01-28 5:22 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2009-01-28 5:22 UTC (permalink / raw
To: gentoo-commits
vapier 09/01/28 05:22:05
Modified: toolchain.eclass
Log:
fixup dependency_libs for moved libtool archives as well #125728
Revision Changes Path
1.384 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.384&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.384&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.383&r2=1.384
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.383
retrieving revision 1.384
diff -u -r1.383 -r1.384
--- toolchain.eclass 28 Jan 2009 04:29:52 -0000 1.383
+++ toolchain.eclass 28 Jan 2009 05:22:05 -0000 1.384
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.383 2009/01/28 04:29:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.384 2009/01/28 05:22:05 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1932,8 +1932,6 @@
done
find "${D}" -type d | xargs rmdir >& /dev/null
- # make sure the libtool archives have libdir set to where they actually
- # -are-, and not where they -used- to be.
fix_libtool_libdir_paths $(find "${D}"${LIBPATH} -name *.la)
}
@@ -2450,11 +2448,19 @@
fi
}
+# make sure the libtool archives have libdir set to where they actually
+# -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 dirpath
- for archive in $* ; do
- dirpath=$(dirname ${archive} | sed -e "s:^${D}::")
- sed -i ${archive} -e "s:^libdir.*:libdir=\'${dirpath}\':"
+ local dirpath allarchives="${@##*/}"
+ allarchives="\(${allarchives// /\\|}\)"
+ for archive in "$@" ; do
+ dirpath=${archive%/*}
+ dirpath=${dirpath#${D}}
+ sed -i \
+ -e "/^libdir=/s:=.*:'${dirpath}':" \
+ -e "/^dependency_libs=/s:/[^ ]*/${allarchives}:${dirpath}/\1:g" \
+ "${archive}"
done
}
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2009-01-28 21:00 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2009-01-28 21:00 UTC (permalink / raw
To: gentoo-commits
vapier 09/01/28 21:00:27
Modified: toolchain.eclass
Log:
use emake rather than make
Revision Changes Path
1.385 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.385&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.385&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.384&r2=1.385
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.384
retrieving revision 1.385
diff -u -r1.384 -r1.385
--- toolchain.eclass 28 Jan 2009 05:22:05 -0000 1.384
+++ toolchain.eclass 28 Jan 2009 21:00:27 -0000 1.385
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.384 2009/01/28 05:22:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.385 2009/01/28 21:00:27 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1485,7 +1485,6 @@
fi
pushd "${WORKDIR}"/build
- einfo "Running make LDFLAGS=\"${LDFLAGS}\" STAGE1_CFLAGS=\"${STAGE1_CFLAGS}\" LIBPATH=\"${LIBPATH}\" BOOT_CFLAGS=\"${BOOT_CFLAGS}\" ${GCC_MAKE_TARGET}"
emake \
LDFLAGS="${LDFLAGS}" \
@@ -1644,11 +1643,10 @@
}
gcc-library_src_install() {
- einfo "Installing ${PN} ..."
# Do the 'make install' from the build directory
cd "${WORKDIR}"/build
S=${WORKDIR}/build \
- make DESTDIR="${D}" \
+ emake DESTDIR="${D}" \
prefix=${PREFIX} \
bindir=${BINPATH} \
includedir=${LIBPATH}/include \
@@ -1696,11 +1694,10 @@
grep -q 'It has been auto-edited by fixincludes from' "${x}" \
&& rm -f "${x}"
done
- einfo "Installing GCC..."
# Do the 'make install' from the build directory
cd "${WORKDIR}"/build
S=${WORKDIR}/build \
- make DESTDIR="${D}" install || die
+ emake DESTDIR="${D}" install || die
# Punt some tools which are really only useful while building gcc
find "${D}" -name install-tools -prune -type d -exec rm -rf "{}" \;
# This one comes with binutils
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2009-01-28 23:40 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2009-01-28 23:40 UTC (permalink / raw
To: gentoo-commits
vapier 09/01/28 23:40:38
Modified: toolchain.eclass
Log:
need to rewrite dependency_libs lines in all .la files #125728
Revision Changes Path
1.387 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.387&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.387&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.386&r2=1.387
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.386
retrieving revision 1.387
diff -u -r1.386 -r1.387
--- toolchain.eclass 28 Jan 2009 21:01:10 -0000 1.386
+++ toolchain.eclass 28 Jan 2009 23:40:38 -0000 1.387
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.386 2009/01/28 21:01:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.387 2009/01/28 23:40:38 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1929,7 +1929,7 @@
done
find "${D}" -type d | xargs rmdir >& /dev/null
- fix_libtool_libdir_paths $(find "${D}"${LIBPATH} -name *.la)
+ fix_libtool_libdir_paths
}
#----<< src_* >>----
@@ -2449,16 +2449,21 @@
# -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 dirpath allarchives="${@##*/}"
+ pushd "${D}" >/dev/null
+
+ local dir=${LIBPATH}
+ local allarchives=$(cd ./${dir}; echo *.la)
allarchives="\(${allarchives// /\\|}\)"
- for archive in "$@" ; do
- dirpath=${archive%/*}
- dirpath=${dirpath#${D}}
- sed -i \
- -e "/^libdir=/s:=.*:='${dirpath}':" \
- -e "/^dependency_libs=/s:/[^ ]*/${allarchives}:${dirpath}/\1:g" \
- "${archive}"
- done
+
+ sed -i \
+ -e "/^libdir=/s:=.*:='${dir}':" \
+ ./${dir}/*.la
+ sed -i \
+ -e "/^dependency_libs=/s:/[^ ]*/${allarchives}:${LIBPATH}/\1:g" \
+ $(find ./${PREFIX}/lib* -maxdepth 3 -name '*.la') \
+ ./${dir}/*.la
+
+ popd >/dev/null
}
is_multilib() {
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2009-01-29 0:11 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2009-01-29 0:11 UTC (permalink / raw
To: gentoo-commits
vapier 09/01/29 00:11:26
Modified: toolchain.eclass
Log:
improve pruning of empty dirs and bogus symlinks in fixed-includes
Revision Changes Path
1.388 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.388&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.388&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.387&r2=1.388
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.387
retrieving revision 1.388
diff -u -r1.387 -r1.388
--- toolchain.eclass 28 Jan 2009 23:40:38 -0000 1.387
+++ toolchain.eclass 29 Jan 2009 00:11:26 -0000 1.388
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.387 2009/01/28 23:40:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.388 2009/01/29 00:11:26 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1683,19 +1683,16 @@
gcc-compiler_src_install() {
local x=
- # Do allow symlinks in ${PREFIX}/lib/gcc-lib/${CHOST}/${GCC_CONFIG_VER}/include as
- # this can break the build.
- for x in "${WORKDIR}"/build/gcc/include*/* ; do
- [[ -L ${x} ]] && rm -f "${x}"
- done
+ cd "${WORKDIR}"/build
+ # Do allow symlinks in private gcc include dir as this can break the build
+ find gcc/include*/ -type l -print0 | xargs rm -f
# Remove generated headers, as they can cause things to break
# (ncurses, openssl, etc).
- for x in $(find "${WORKDIR}"/build/gcc/include*/ -name '*.h') ; do
+ for x in $(find gcc/include*/ -name '*.h') ; do
grep -q 'It has been auto-edited by fixincludes from' "${x}" \
&& rm -f "${x}"
done
# Do the 'make install' from the build directory
- cd "${WORKDIR}"/build
S=${WORKDIR}/build \
emake DESTDIR="${D}" install || die
# Punt some tools which are really only useful while building gcc
@@ -1809,7 +1806,9 @@
|| prepman "${DATAPATH}"
fi
# prune empty dirs left behind
- find "${D}" -type d | xargs rmdir >& /dev/null
+ for x in 1 2 3 4 ; do
+ find "${D}" -type d -exec rmdir "{}" \; >& /dev/null
+ done
# install testsuite results
if use test; then
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2009-01-29 6:06 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2009-01-29 6:06 UTC (permalink / raw
To: gentoo-commits
vapier 09/01/29 06:06:45
Modified: toolchain.eclass
Log:
at least gcc-4.1 has problems with parallel installs, so use -j1 with it
Revision Changes Path
1.389 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.389&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.389&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.388&r2=1.389
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.388
retrieving revision 1.389
diff -u -r1.388 -r1.389
--- toolchain.eclass 29 Jan 2009 00:11:26 -0000 1.388
+++ toolchain.eclass 29 Jan 2009 06:06:45 -0000 1.389
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.388 2009/01/29 00:11:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.389 2009/01/29 06:06:45 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1646,7 +1646,8 @@
# Do the 'make install' from the build directory
cd "${WORKDIR}"/build
S=${WORKDIR}/build \
- emake DESTDIR="${D}" \
+ emake -j1 \
+ DESTDIR="${D}" \
prefix=${PREFIX} \
bindir=${BINPATH} \
includedir=${LIBPATH}/include \
@@ -1694,7 +1695,7 @@
done
# Do the 'make install' from the build directory
S=${WORKDIR}/build \
- emake DESTDIR="${D}" install || die
+ emake -j1 DESTDIR="${D}" install || die
# Punt some tools which are really only useful while building gcc
find "${D}" -name install-tools -prune -type d -exec rm -rf "{}" \;
# This one comes with binutils
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2009-02-09 19:56 Markus Meier (maekke)
0 siblings, 0 replies; 266+ messages in thread
From: Markus Meier (maekke) @ 2009-02-09 19:56 UTC (permalink / raw
To: gentoo-commits
maekke 09/02/09 19:56:08
Modified: toolchain.eclass
Log:
quote some variables, bug #258231
Revision Changes Path
1.390 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.390&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.390&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.389&r2=1.390
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.389
retrieving revision 1.390
diff -u -r1.389 -r1.390
--- toolchain.eclass 29 Jan 2009 06:06:45 -0000 1.389
+++ toolchain.eclass 9 Feb 2009 19:56:07 -0000 1.390
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.389 2009/01/29 06:06:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.390 2009/02/09 19:56:07 maekke Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1033,26 +1033,26 @@
# 1) Move the man files if present (missing prior to gcc-3.4)
for manfile in rmic rmiregistry; do
[[ -f ${S}/gcc/doc/${manfile}.1 ]] || continue
- mv ${S}/gcc/doc/${manfile}.1 ${S}/gcc/doc/g${manfile}.1
+ mv "${S}"/gcc/doc/${manfile}.1 "${S}"/gcc/doc/g${manfile}.1
done
# 2) Fixup references in the docs if present (mission prior to gcc-3.4)
for jfile in gcc/doc/gcj.info gcc/doc/grmic.1 gcc/doc/grmiregistry.1 gcc/java/gcj.texi; do
[[ -f ${S}/${jfile} ]] || continue
- sed -i -e 's:rmiregistry:grmiregistry:g' ${S}/${jfile} ||
+ sed -i -e 's:rmiregistry:grmiregistry:g' "${S}"/${jfile} ||
die "Failed to fixup file ${jfile} for rename to grmiregistry"
- sed -i -e 's:rmic:grmic:g' ${S}/${jfile} ||
+ sed -i -e 's:rmic:grmic:g' "${S}"/${jfile} ||
die "Failed to fixup file ${jfile} for rename to grmic"
done
# 3) Fixup Makefiles to build the changed executable names
# These are present in all 3.x versions, and are the important bit
# to get gcc to build with the new names.
for jfile in libjava/Makefile.am libjava/Makefile.in gcc/java/Make-lang.in; do
- sed -i -e 's:rmiregistry:grmiregistry:g' ${S}/${jfile} ||
+ sed -i -e 's:rmiregistry:grmiregistry:g' "${S}"/${jfile} ||
die "Failed to fixup file ${jfile} for rename to grmiregistry"
# Careful with rmic on these files; it's also the name of a directory
# which should be left unchanged. Replace occurrences of 'rmic$',
# 'rmic_' and 'rmic '.
- sed -i -e 's:rmic\([$_ ]\):grmic\1:g' ${S}/${jfile} ||
+ sed -i -e 's:rmic\([$_ ]\):grmic\1:g' "${S}"/${jfile} ||
die "Failed to fixup file ${jfile} for rename to grmic"
done
}
@@ -1962,7 +1962,7 @@
# We want branch updates to be against a release tarball
if [[ -n ${BRANCH_UPDATE} ]] ; then
pushd "${S}" > /dev/null
- epatch ${DISTDIR}/gcc-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
+ epatch "${DISTDIR}"/gcc-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
popd > /dev/null
fi
fi
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2009-02-15 23:04 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2009-02-15 23:04 UTC (permalink / raw
To: gentoo-commits
vapier 09/02/15 23:04:39
Modified: toolchain.eclass
Log:
replace more cpu flags for gcc-3.3 #252698 by Le retraité
Revision Changes Path
1.391 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.391&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.391&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.390&r2=1.391
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.390
retrieving revision 1.391
diff -u -r1.390 -r1.391
--- toolchain.eclass 9 Feb 2009 19:56:07 -0000 1.390
+++ toolchain.eclass 15 Feb 2009 23:04:39 -0000 1.391
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.390 2009/02/09 19:56:07 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.391 2009/02/15 23:04:39 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1555,10 +1555,10 @@
case ${GCC_BRANCH_VER} in
3.2|3.3)
+ replace-cpu-flags k8 athlon64 opteron i686
+ replace-cpu-flags pentium-m pentium3m pentium3
case $(tc-arch) in
- x86) filter-flags '-mtune=*';;
- amd64) filter-flags '-mtune=*'
- replace-cpu-flags k8 athlon64 opteron i686;;
+ amd64|x86) filter-flags '-mtune=*';;
esac
;;
3.4|4.*)
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2009-03-01 20:37 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2009-03-01 20:37 UTC (permalink / raw
To: gentoo-commits
vapier 09/03/01 20:37:50
Modified: toolchain.eclass
Log:
filter more flags for gcc-3.3
Revision Changes Path
1.392 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.392&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.392&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.391&r2=1.392
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -r1.391 -r1.392
--- toolchain.eclass 15 Feb 2009 23:04:39 -0000 1.391
+++ toolchain.eclass 1 Mar 2009 20:37:50 -0000 1.392
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.391 2009/02/15 23:04:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.392 2009/03/01 20:37:50 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1555,11 +1555,28 @@
case ${GCC_BRANCH_VER} in
3.2|3.3)
- replace-cpu-flags k8 athlon64 opteron i686
+ replace-cpu-flags k8 athlon64 opteron i686 x86-64
replace-cpu-flags pentium-m pentium3m pentium3
case $(tc-arch) in
- amd64|x86) filter-flags '-mtune=*';;
+ amd64|x86) filter-flags '-mtune=*' ;;
+ # in gcc 3.3 there is a bug on ppc64 where if -mcpu is used,
+ # the compiler wrongly assumes a 32bit target
+ ppc64) filter-flags "-mcpu=*";;
esac
+ case $(tc-arch) in
+ amd64) replace-cpu-flags core2 nocona;;
+ x86) replace-cpu-flags core2 prescott;;
+ esac
+
+ replace-cpu-flags G3 750
+ replace-cpu-flags G4 7400
+ replace-cpu-flags G5 7400
+
+ # XXX: should add a sed or something to query all supported flags
+ # from the gcc source and trim everything else ...
+ filter-flags -f{no-,}unit-at-a-time -f{no-,}web -mno-tls-direct-seg-refs
+ filter-flags -f{no-,}stack-protector{,-all}
+ filter-flags -fvisibility-inlines-hidden -fvisibility=hidden
;;
3.4|4.*)
case $(tc-arch) in
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2009-03-01 20:41 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2009-03-01 20:41 UTC (permalink / raw
To: gentoo-commits
vapier 09/03/01 20:41:26
Modified: toolchain.eclass
Log:
apply configure texinfo patch for gcc-4.1+ #260296
Revision Changes Path
1.393 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.393&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.393&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.392&r2=1.393
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.392
retrieving revision 1.393
diff -u -r1.392 -r1.393
--- toolchain.eclass 1 Mar 2009 20:37:50 -0000 1.392
+++ toolchain.eclass 1 Mar 2009 20:41:26 -0000 1.393
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.392 2009/03/01 20:37:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.393 2009/03/01 20:41:26 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1120,10 +1120,7 @@
# disable --as-needed from being compiled into gcc specs
# natively when using a gcc version < 3.4.4
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=14992
- if [[ ${GCCMAJOR} < 3 ]] || \
- [[ ${GCCMAJOR}.${GCCMINOR} < 3.4 ]] || \
- [[ ${GCCMAJOR}.${GCCMINOR}.${GCCMICRO} < 3.4.4 ]]
- then
+ if ! tc_version_is_at_least 3.4.4 ; then
sed -i -e s/HAVE_LD_AS_NEEDED/USE_LD_AS_NEEDED/g "${S}"/gcc/config.in
fi
@@ -1144,7 +1141,7 @@
# update configure files
local f
einfo "Fixing misc issues in configure files"
- [[ ${GCCMAJOR} -ge 4 ]] && epatch "${GCC_FILESDIR}"/gcc-configure-texinfo.patch
+ tc_version_is_at_least 4.1 && epatch "${GCC_FILESDIR}"/gcc-configure-texinfo.patch
for f in $(grep -l 'autoconf version 2.13' $(find "${S}" -name configure)) ; do
ebegin " Updating ${f/${S}\/} [LANG]"
patch "${f}" "${GCC_FILESDIR}"/gcc-configure-LANG.patch >& "${T}"/configure-patch.log \
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2009-03-15 7:11 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2009-03-15 7:11 UTC (permalink / raw
To: gentoo-commits
vapier 09/03/15 07:11:56
Modified: toolchain.eclass
Log:
treelang and boundschecking do not play well together #260532
Revision Changes Path
1.394 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.394&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.394&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.393&r2=1.394
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.393
retrieving revision 1.394
diff -u -r1.393 -r1.394
--- toolchain.eclass 1 Mar 2009 20:41:26 -0000 1.393
+++ toolchain.eclass 15 Mar 2009 07:11:56 -0000 1.394
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.393 2009/03/01 20:41:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.394 2009/03/15 07:11:56 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -2540,6 +2540,7 @@
}
is_treelang() {
+ has boundschecking ${IUSE} && use boundschecking && return 1 #260532
is_crosscompile && return 1 #199924
gcc-lang-supported treelang || return 1
#use treelang
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2009-03-15 7:13 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2009-03-15 7:13 UTC (permalink / raw
To: gentoo-commits
vapier 09/03/15 07:13:25
Modified: toolchain.eclass
Log:
use --enable-clocale=uclibc for [3.4..4.2] #258642
Revision Changes Path
1.395 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.395&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.395&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.394&r2=1.395
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.394
retrieving revision 1.395
diff -u -r1.394 -r1.395
--- toolchain.eclass 15 Mar 2009 07:11:56 -0000 1.394
+++ toolchain.eclass 15 Mar 2009 07:13:25 -0000 1.395
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.394 2009/03/15 07:11:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.395 2009/03/15 07:13:25 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1371,7 +1371,9 @@
if [[ ${CTARGET} == *-uclibc* ]] ; then
confgcc="${confgcc} --disable-__cxa_atexit --enable-target-optspace"
[[ ${GCCMAJOR}.${GCCMINOR} == 3.3 ]] && confgcc="${confgcc} --enable-sjlj-exceptions"
- [[ ${GCCMAJOR}.${GCCMINOR} > 3.3 ]] && confgcc="${confgcc} --enable-clocale=uclibc"
+ if tc_version_is_at_least 3.4 && [[ ${GCCMAJOR}.${GCCMINOR} < 4.3 ]] ; then
+ confgcc="${confgcc} --enable-clocale=uclibc"
+ fi
elif [[ ${CTARGET} == *-gnu* ]] ; then
confgcc="${confgcc} --enable-__cxa_atexit"
confgcc="${confgcc} --enable-clocale=gnu"
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2009-04-04 16:52 Fabian Groffen (grobian)
0 siblings, 0 replies; 266+ messages in thread
From: Fabian Groffen (grobian) @ 2009-04-04 16:52 UTC (permalink / raw
To: gentoo-commits
grobian 09/04/04 16:52:40
Modified: toolchain.eclass
Log:
backport some fixes for Darwin and Solaris from Prefix
Revision Changes Path
1.396 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.396&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.396&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.395&r2=1.396
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.395
retrieving revision 1.396
diff -u -r1.395 -r1.396
--- toolchain.eclass 15 Mar 2009 07:13:25 -0000 1.395
+++ toolchain.eclass 4 Apr 2009 16:52:40 -0000 1.396
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.395 2009/03/15 07:13:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.396 2009/04/04 16:52:40 grobian Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1285,6 +1285,12 @@
--mandir=${DATAPATH}/man \
--infodir=${DATAPATH}/info \
--with-gxx-include-dir=${STDCXX_INCDIR}"
+ # On Darwin we need libdir to be set in order to get correct install names
+ # for things like libobjc-gnu, libgcj and libfortran. If we enable it on
+ # non-Darwin we screw up the behaviour this eclass relies on. We in
+ # particular need this over --libdir for bug #255315.
+ [[ ${CHOST} == *-darwin* ]] && \
+ confgcc="${confgcc} --enable-version-specific-runtime-libs"
# All our cross-compile logic goes here ! woo !
confgcc="${confgcc} --host=${CHOST}"
@@ -1379,6 +1385,8 @@
confgcc="${confgcc} --enable-clocale=gnu"
elif [[ ${CTARGET} == *-freebsd* ]]; then
confgcc="${confgcc} --enable-__cxa_atexit"
+ elif [[ ${CTARGET} == *-solaris* ]]; then
+ confgcc="${confgcc} --enable-__cxa_atexit"
fi
[[ ${GCCMAJOR}.${GCCMINOR} < 3.4 ]] && confgcc="${confgcc} --disable-libunwind-exceptions"
@@ -1580,6 +1588,11 @@
3.4|4.*)
case $(tc-arch) in
x86|amd64) filter-flags '-mcpu=*';;
+ *-macos)
+ # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=25127
+ [[ ${GCC_BRANCH_VER} == 4.0 || ${GCC_BRANCH_VER} == 4.1 ]] && \
+ filter-flags '-mcpu=*' '-march=*' '-mtune=*'
+ ;;
esac
;;
esac
@@ -2487,6 +2500,8 @@
case ${CTARGET} in
mips64*|powerpc64*|s390x*|sparc*|x86_64*)
has_multilib_profile || use multilib ;;
+ *-*-solaris*) use multilib ;;
+ *-apple-darwin*) use multilib ;;
*) false ;;
esac
}
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2009-05-07 1:45 Mark Loeser (halcy0n)
0 siblings, 0 replies; 266+ messages in thread
From: Mark Loeser (halcy0n) @ 2009-05-07 1:45 UTC (permalink / raw
To: gentoo-commits
halcy0n 09/05/07 01:45:56
Modified: toolchain.eclass
Log:
There is only one version of the ecj.jar upstream currently, so we'll use the 4.3 one everywhere until they give us another version
Revision Changes Path
1.397 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.397&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.397&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.396&r2=1.397
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.396
retrieving revision 1.397
diff -u -r1.396 -r1.397
--- toolchain.eclass 4 Apr 2009 16:52:40 -0000 1.396
+++ toolchain.eclass 7 May 2009 01:45:55 -0000 1.397
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.396 2009/04/04 16:52:40 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.397 2009/05/07 01:45:55 halcy0n Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -355,7 +355,7 @@
if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then
tc_version_is_at_least "4.3" && \
GCC_SRC_URI="${GCC_SRC_URI}
- gcj? ( ftp://sourceware.org/pub/java/ecj-${GCC_BRANCH_VER}.jar )"
+ gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )"
fi
echo "${GCC_SRC_URI}"
@@ -1114,7 +1114,7 @@
# >= gcc-4.3 doesn't bundle ecj.jar, so copy it
if [[ ${GCCMAJOR}.${GCCMINOR} > 4.2 ]] &&
use gcj ; then
- cp -pPR "${DISTDIR}/ecj-${GCC_BRANCH_VER}.jar" "${S}/ecj.jar" || die
+ cp -pPR "${DISTDIR}/ecj-4.3.jar" "${S}/ecj.jar" || die
fi
# disable --as-needed from being compiled into gcc specs
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2009-05-07 23:56 Mark Loeser (halcy0n)
0 siblings, 0 replies; 266+ messages in thread
From: Mark Loeser (halcy0n) @ 2009-05-07 23:56 UTC (permalink / raw
To: gentoo-commits
halcy0n 09/05/07 23:56:12
Modified: toolchain.eclass
Log:
Add support for graphite
Revision Changes Path
1.398 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.398&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.398&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.397&r2=1.398
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.397
retrieving revision 1.398
diff -u -r1.397 -r1.398
--- toolchain.eclass 7 May 2009 01:45:55 -0000 1.397
+++ toolchain.eclass 7 May 2009 23:56:12 -0000 1.398
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.397 2009/05/07 01:45:55 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.398 2009/05/07 23:56:12 halcy0n Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -156,6 +156,7 @@
tc_version_is_at_least "4.1" && IUSE="${IUSE} objc++"
tc_version_is_at_least "4.2" && IUSE="${IUSE} openmp"
tc_version_is_at_least "4.3" && IUSE="${IUSE} fixed-point"
+ tc_version_is_at_least "4.4" && IUSE="${IUSE} graphite"
fi
fi
@@ -1311,6 +1312,12 @@
# users to control this feature in the event they need the support.
tc_version_is_at_least "4.3" && confgcc="${confgcc} $(use_enable fixed-point)"
+ # graphite support was added in 4.4, which depends upon external libraries
+ # for optimizations. This option allows users to determine if they want
+ # these optimizations and libraries pulled in
+ tc_version_is_at_least "4.4" && \
+ confgcc="${confgcc} $(use_with graphite ppl) $(use_with graphite cloog)"
+
[[ $(tc-is-softfloat) == "yes" ]] && confgcc="${confgcc} --with-float=soft"
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2009-05-24 16:57 Raul Porcel (armin76)
0 siblings, 0 replies; 266+ messages in thread
From: Raul Porcel (armin76) @ 2009-05-24 16:57 UTC (permalink / raw
To: gentoo-commits
armin76 09/05/24 16:57:44
Modified: toolchain.eclass
Log:
Add fix for bug #262105, sparc-only
Revision Changes Path
1.399 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.399&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.399&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.398&r2=1.399
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.398
retrieving revision 1.399
diff -u -r1.398 -r1.399
--- toolchain.eclass 7 May 2009 23:56:12 -0000 1.398
+++ toolchain.eclass 24 May 2009 16:57:43 -0000 1.399
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.398 2009/05/07 23:56:12 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.399 2009/05/24 16:57:43 armin76 Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1400,6 +1400,7 @@
# create a sparc*linux*-{gcc,g++} that can handle -m32 and -m64 (biarch)
if [[ ${CTARGET} == sparc*linux* ]] \
&& is_multilib \
+ && ! is_crosscompile \
&& [[ ${GCCMAJOR}.${GCCMINOR} > 4.2 ]]
then
confgcc="${confgcc} --enable-targets=all"
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2009-06-09 20:59 Ryan Hill (dirtyepic)
0 siblings, 0 replies; 266+ messages in thread
From: Ryan Hill (dirtyepic) @ 2009-06-09 20:59 UTC (permalink / raw
To: gentoo-commits
dirtyepic 09/06/09 20:59:43
Modified: toolchain.eclass
Log:
Protoize is removed in 4.5. Bug #270558.
Revision Changes Path
1.400 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.400&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.400&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.399&r2=1.400
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.399
retrieving revision 1.400
diff -u -r1.399 -r1.400
--- toolchain.eclass 24 May 2009 16:57:43 -0000 1.399
+++ toolchain.eclass 9 Jun 2009 20:59:43 -0000 1.400
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.399 2009/05/24 16:57:43 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.400 2009/06/09 20:59:43 dirtyepic Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1088,9 +1088,12 @@
${ETYPE}_src_unpack || die "failed to ${ETYPE}_src_unpack"
# protoize don't build on FreeBSD, skip it
- if ! is_crosscompile && ! use elibc_FreeBSD ; then
- # enable protoize / unprotoize
- sed -i -e '/^LANGUAGES =/s:$: proto:' "${S}"/gcc/Makefile.in
+ ## removed in 4.5, bug #270558 --de.
+ if [[ ${GCCMAJOR}.${GCCMINOR} < 4.5 ]]; then
+ if ! is_crosscompile && ! use elibc_FreeBSD ; then
+ # enable protoize / unprotoize
+ sed -i -e '/^LANGUAGES =/s:$: proto:' "${S}"/gcc/Makefile.in
+ fi
fi
fix_files=""
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2009-07-03 5:43 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2009-07-03 5:43 UTC (permalink / raw
To: gentoo-commits
vapier 09/07/03 05:43:51
Modified: toolchain.eclass
Log:
add USE=nptl to control TLS for uClibc targets #270767 by zabuzzman
Revision Changes Path
1.401 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.401&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.401&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.400&r2=1.401
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.400
retrieving revision 1.401
diff -u -r1.400 -r1.401
--- toolchain.eclass 9 Jun 2009 20:59:43 -0000 1.400
+++ toolchain.eclass 3 Jul 2009 05:43:51 -0000 1.401
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.400 2009/06/09 20:59:43 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.401 2009/07/03 05:43:51 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -135,7 +135,7 @@
IUSE="nls build test"
SLOT="${CTARGET}-${SO_VERSION_SLOT:-5}"
else
- IUSE="multislot test"
+ IUSE="multislot nptl test"
if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then
IUSE="${IUSE} altivec build fortran nls nocxx"
@@ -1385,7 +1385,7 @@
# __cxa_atexit is "essential for fully standards-compliant handling of
# destructors", but apparently requires glibc.
if [[ ${CTARGET} == *-uclibc* ]] ; then
- confgcc="${confgcc} --disable-__cxa_atexit --enable-target-optspace"
+ confgcc="${confgcc} --disable-__cxa_atexit --enable-target-optspace $(use_enable nptl tls)"
[[ ${GCCMAJOR}.${GCCMINOR} == 3.3 ]] && confgcc="${confgcc} --enable-sjlj-exceptions"
if tc_version_is_at_least 3.4 && [[ ${GCCMAJOR}.${GCCMINOR} < 4.3 ]] ; then
confgcc="${confgcc} --enable-clocale=uclibc"
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2009-07-05 19:56 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2009-07-05 19:56 UTC (permalink / raw
To: gentoo-commits
vapier 09/07/05 19:56:42
Modified: toolchain.eclass
Log:
filter LANGUAGES env var #265283 by Miguel R. Caudevilla
Revision Changes Path
1.402 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.402&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.402&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.401&r2=1.402
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.401
retrieving revision 1.402
diff -u -r1.401 -r1.402
--- toolchain.eclass 3 Jul 2009 05:43:51 -0000 1.401
+++ toolchain.eclass 5 Jul 2009 19:56:42 -0000 1.402
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.401 2009/07/03 05:43:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.402 2009/07/05 19:56:42 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -882,6 +882,8 @@
want_libssp && libc_has_ssp && \
die "libssp cannot be used with a glibc that has been patched to provide ssp symbols"
+
+ unset LANGUAGES #265283
}
gcc-compiler_pkg_preinst() {
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2009-07-26 20:10 Mark Loeser (halcy0n)
0 siblings, 0 replies; 266+ messages in thread
From: Mark Loeser (halcy0n) @ 2009-07-26 20:10 UTC (permalink / raw
To: gentoo-commits
halcy0n 09/07/26 20:10:00
Modified: toolchain.eclass
Log:
Fix a typo, and if we have USE vanilla, don't apply the PIE patches
Revision Changes Path
1.403 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.403&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.403&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.402&r2=1.403
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.402
retrieving revision 1.403
diff -u -r1.402 -r1.403
--- toolchain.eclass 5 Jul 2009 19:56:42 -0000 1.402
+++ toolchain.eclass 26 Jul 2009 20:09:59 -0000 1.403
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.402 2009/07/05 19:56:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.403 2009/07/26 20:09:59 halcy0n Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -498,7 +498,7 @@
if [[ -n ${SPECS_VER} ]] ; then
return 0
else
- die "For Hardend to work you need the minispecs files"
+ die "For Hardened to work you need the minispecs files"
fi
fi
return 1
@@ -2226,7 +2226,7 @@
&& rm -f "${WORKDIR}"/piepatch/*/*-boundschecking-no.patch* \
|| rm -f "${WORKDIR}"/piepatch/*/*-boundschecking-yes.patch*
- use vanilla && rm -f "${WORKDIR}"/piepatch/*/*uclibc*
+ use vanilla && return 0
if tc_version_is_at_least 4.3.2; then
guess_patch_type_in_dir "${WORKDIR}"/piepatch/
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2009-08-13 18:15 Mark Loeser (halcy0n)
0 siblings, 0 replies; 266+ messages in thread
From: Mark Loeser (halcy0n) @ 2009-08-13 18:15 UTC (permalink / raw
To: gentoo-commits
halcy0n 09/08/13 18:15:14
Modified: toolchain.eclass
Log:
Fix bug #279252; --with-python-dir prepends the prefix to the path already, so we strip it from DATAPATH and stick the scripts in a python directory there
Revision Changes Path
1.404 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.404&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.404&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.403&r2=1.404
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.403
retrieving revision 1.404
diff -u -r1.403 -r1.404
--- toolchain.eclass 26 Jul 2009 20:09:59 -0000 1.403
+++ toolchain.eclass 13 Aug 2009 18:15:13 -0000 1.404
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.403 2009/07/26 20:09:59 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.404 2009/08/13 18:15:13 halcy0n Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1208,6 +1208,12 @@
confgcc="${confgcc} --enable-cld"
fi
fi
+
+ # Stick the python scripts in their own slotted directory
+ # bug #279252
+ if tc_version_is_at_least "4.4" ; then
+ confgcc="${confgcc} --with-python-dir=${DATAPATH/$PREFIX/}/python"
+ fi
fi
# GTK+ is preferred over xlib in 3.4.x (xlib is unmaintained
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2009-09-08 2:48 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2009-09-08 2:48 UTC (permalink / raw
To: gentoo-commits
vapier 09/09/08 02:48:46
Modified: toolchain.eclass
Log:
fix by Peter Alfredsen for libdir tweaking in multilib .la files #283761
Revision Changes Path
1.407 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.407&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.407&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.406&r2=1.407
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.406
retrieving revision 1.407
diff -u -r1.406 -r1.407
--- toolchain.eclass 26 Aug 2009 21:47:56 -0000 1.406
+++ toolchain.eclass 8 Sep 2009 02:48:46 -0000 1.407
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.406 2009/08/26 21:47:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.407 2009/09/08 02:48:46 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1966,6 +1966,7 @@
fi
fi
done
+ fix_libtool_libdir_paths "${LIBPATH}/${MULTIDIR}"
done
# We remove directories separately to avoid this case:
@@ -1976,8 +1977,6 @@
rmdir "${D}"${FROMDIR} >& /dev/null
done
find "${D}" -type d | xargs rmdir >& /dev/null
-
- fix_libtool_libdir_paths
}
#----<< src_* >>----
@@ -2483,9 +2482,11 @@
fix_libtool_libdir_paths() {
pushd "${D}" >/dev/null
- local dir=${LIBPATH}
- local allarchives=$(cd ./${dir}; echo *.la)
+ pushd "${1}" >/dev/null
+ local dir="${PWD#${D}}"
+ local allarchives=$(echo *.la)
allarchives="\(${allarchives// /\\|}\)"
+ popd >/dev/null
sed -i \
-e "/^libdir=/s:=.*:='${dir}':" \
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2009-10-12 19:01 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2009-10-12 19:01 UTC (permalink / raw
To: gentoo-commits
vapier 09/10/12 19:01:31
Modified: toolchain.eclass
Log:
add support for _rc versions by Bruno Tsubouchi Yporti #288701 and tweak checking of GCC_PV in general
Revision Changes Path
1.408 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.408&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.408&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.407&r2=1.408
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.407
retrieving revision 1.408
diff -u -r1.407 -r1.408
--- toolchain.eclass 8 Sep 2009 02:48:46 -0000 1.407
+++ toolchain.eclass 12 Oct 2009 19:01:31 -0000 1.408
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.407 2009/09/08 02:48:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.408 2009/10/12 19:01:31 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -79,10 +79,12 @@
PRERELEASE=${GCC_PV/_pre/-}
fi
# make _alpha and _beta ebuilds automatically use a snapshot
-if [[ ${GCC_PV} != ${GCC_PV/_alpha/} ]] ; then
+if [[ ${GCC_PV} == *_alpha* ]] ; then
SNAPSHOT=${GCC_BRANCH_VER}-${GCC_PV##*_alpha}
-elif [[ ${GCC_PV} != ${GCC_PV/_beta/} ]] ; then
+elif [[ ${GCC_PV} == *_beta* ]] ; then
SNAPSHOT=${GCC_BRANCH_VER}-${GCC_PV##*_beta}
+elif [[ ${GCC_PV} == *_rc* ]] ; then
+ SNAPSHOT=${GCC_PV%_rc*}-RC-${GCC_PV##*_rc}
fi
export GCC_FILESDIR=${GCC_FILESDIR:-${FILESDIR}}
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2009-10-18 7:24 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2009-10-18 7:24 UTC (permalink / raw
To: gentoo-commits
vapier 09/10/18 07:24:58
Modified: toolchain.eclass
Log:
get la path list from $D rather than / as pointed out by Ryan Hill #283761#10
Revision Changes Path
1.409 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.409&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.409&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.408&r2=1.409
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.408
retrieving revision 1.409
diff -u -r1.408 -r1.409
--- toolchain.eclass 12 Oct 2009 19:01:31 -0000 1.408
+++ toolchain.eclass 18 Oct 2009 07:24:58 -0000 1.409
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.408 2009/10/12 19:01:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.409 2009/10/18 07:24:58 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -2484,7 +2484,7 @@
fix_libtool_libdir_paths() {
pushd "${D}" >/dev/null
- pushd "${1}" >/dev/null
+ pushd "./${1}" >/dev/null
local dir="${PWD#${D}}"
local allarchives=$(echo *.la)
allarchives="\(${allarchives// /\\|}\)"
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2009-10-19 1:49 Ryan Hill (dirtyepic)
0 siblings, 0 replies; 266+ messages in thread
From: Ryan Hill (dirtyepic) @ 2009-10-19 1:49 UTC (permalink / raw
To: gentoo-commits
dirtyepic 09/10/19 01:49:36
Modified: toolchain.eclass
Log:
Don't strip leading slash from libdir path.
Revision Changes Path
1.410 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.410&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.410&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.409&r2=1.410
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.409
retrieving revision 1.410
diff -u -r1.409 -r1.410
--- toolchain.eclass 18 Oct 2009 07:24:58 -0000 1.409
+++ toolchain.eclass 19 Oct 2009 01:49:36 -0000 1.410
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.409 2009/10/18 07:24:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.410 2009/10/19 01:49:36 dirtyepic Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -2485,7 +2485,7 @@
pushd "${D}" >/dev/null
pushd "./${1}" >/dev/null
- local dir="${PWD#${D}}"
+ local dir="${PWD#${D%/}}"
local allarchives=$(echo *.la)
allarchives="\(${allarchives// /\\|}\)"
popd >/dev/null
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2009-12-04 15:00 Diego Petteno (flameeyes)
0 siblings, 0 replies; 266+ messages in thread
From: Diego Petteno (flameeyes) @ 2009-12-04 15:00 UTC (permalink / raw
To: gentoo-commits
flameeyes 09/12/04 15:00:47
Modified: toolchain.eclass
Log:
Remove the libgcj pkg-config file when cross-compiling.
This solves the collision problem with sys-devel/gcc[gcj]; since the
pkg-config does not seem to be used for cross-compiling this should be
enough.
Revision Changes Path
1.411 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.411&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.411&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.410&r2=1.411
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.410
retrieving revision 1.411
diff -u -r1.410 -r1.411
--- toolchain.eclass 19 Oct 2009 01:49:36 -0000 1.410
+++ toolchain.eclass 4 Dec 2009 15:00:47 -0000 1.411
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.410 2009/10/19 01:49:36 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.411 2009/12/04 15:00:47 flameeyes Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1920,11 +1920,16 @@
[[ -f ${D}${PREFIX}/lib/libgcj.spec ]] && \
mv -f "${D}"${PREFIX}/lib/libgcj.spec "${D}"${LIBPATH}/libgcj.spec
- # SLOT up libgcj.pc (and let gcc-config worry about links)
local libgcj=$(find "${D}"${PREFIX}/lib/pkgconfig/ -name 'libgcj*.pc')
if [[ -n ${libgcj} ]] ; then
- sed -i "/^libdir=/s:=.*:=${LIBPATH}:" "${libgcj}"
- mv "${libgcj}" "${D}"/usr/lib/pkgconfig/libgcj-${GCC_PV}.pc || die
+ if is_crosscompile ; then
+ # Simply remove the libgcj.pc file for cross-compilers
+ rm "${libgcj}" || die
+ else
+ # SLOT up libgcj.pc (and let gcc-config worry about links)
+ sed -i "/^libdir=/s:=.*:=${LIBPATH}:" "${libgcj}"
+ mv "${libgcj}" "${D}"/usr/lib/pkgconfig/libgcj-${GCC_PV}.pc || die
+ fi
fi
# Rename jar because it could clash with Kaffe's jar if this gcc is
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2009-12-09 21:25 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2009-12-09 21:25 UTC (permalink / raw
To: gentoo-commits
vapier 09/12/09 21:25:06
Modified: toolchain.eclass
Log:
revert previous commit; we want gcj pc file for both native and cross toolchains so *other packages* can find & link against gcj
Revision Changes Path
1.412 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.412&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.412&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.411&r2=1.412
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.411
retrieving revision 1.412
diff -u -r1.411 -r1.412
--- toolchain.eclass 4 Dec 2009 15:00:47 -0000 1.411
+++ toolchain.eclass 9 Dec 2009 21:25:06 -0000 1.412
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.411 2009/12/04 15:00:47 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.412 2009/12/09 21:25:06 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1920,16 +1920,11 @@
[[ -f ${D}${PREFIX}/lib/libgcj.spec ]] && \
mv -f "${D}"${PREFIX}/lib/libgcj.spec "${D}"${LIBPATH}/libgcj.spec
+ # SLOT up libgcj.pc (and let gcc-config worry about links)
local libgcj=$(find "${D}"${PREFIX}/lib/pkgconfig/ -name 'libgcj*.pc')
if [[ -n ${libgcj} ]] ; then
- if is_crosscompile ; then
- # Simply remove the libgcj.pc file for cross-compilers
- rm "${libgcj}" || die
- else
- # SLOT up libgcj.pc (and let gcc-config worry about links)
- sed -i "/^libdir=/s:=.*:=${LIBPATH}:" "${libgcj}"
- mv "${libgcj}" "${D}"/usr/lib/pkgconfig/libgcj-${GCC_PV}.pc || die
- fi
+ sed -i "/^libdir=/s:=.*:=${LIBPATH}:" "${libgcj}"
+ mv "${libgcj}" "${D}"/usr/lib/pkgconfig/libgcj-${GCC_PV}.pc || die
fi
# Rename jar because it could clash with Kaffe's jar if this gcc is
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2009-12-14 21:14 Harald van Dijk (truedfx)
0 siblings, 0 replies; 266+ messages in thread
From: Harald van Dijk (truedfx) @ 2009-12-14 21:14 UTC (permalink / raw
To: gentoo-commits
truedfx 09/12/14 21:14:13
Modified: toolchain.eclass
Log:
Don't clear DATESTAMP and thus __GLIBCXX__, #296800
Revision Changes Path
1.413 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.413&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.413&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.412&r2=1.413
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.412
retrieving revision 1.413
diff -u -r1.412 -r1.413
--- toolchain.eclass 9 Dec 2009 21:25:06 -0000 1.412
+++ toolchain.eclass 14 Dec 2009 21:14:13 -0000 1.413
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.412 2009/12/09 21:25:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.413 2009/12/14 21:14:13 truedfx Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1115,7 +1115,6 @@
if [[ ${GCCMAJOR}.${GCCMINOR} > 4.0 ]] ; then
if [[ -n ${SNAPSHOT} || -n ${PRERELEASE} ]] ; then
echo ${PV/_/-} > "${S}"/gcc/BASE-VER
- echo "" > "${S}"/gcc/DATESTAMP
fi
fi
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2009-12-20 14:30 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2009-12-20 14:30 UTC (permalink / raw
To: gentoo-commits
vapier 09/12/20 14:30:03
Modified: toolchain.eclass
Log:
send gcc-config errors to /dev/null rather than trying to grep them out #290437
Revision Changes Path
1.414 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.414&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.414&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.413&r2=1.414
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.413
retrieving revision 1.414
diff -u -r1.413 -r1.414
--- toolchain.eclass 14 Dec 2009 21:14:13 -0000 1.413
+++ toolchain.eclass 20 Dec 2009 14:30:03 -0000 1.414
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.413 2009/12/14 21:14:13 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.414 2009/12/20 14:30:03 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -2297,8 +2297,7 @@
local current_gcc_config="" current_specs="" use_specs=""
- # We grep out any possible errors
- current_gcc_config=$(env -i ROOT="${ROOT}" gcc-config -c ${CTARGET} | grep -v '^ ')
+ current_gcc_config=$(env -i ROOT="${ROOT}" gcc-config -c ${CTARGET} 2>/dev/null)
if [[ -n ${current_gcc_config} ]] ; then
# figure out which specs-specific config is active
current_specs=$(gcc-config -S ${current_gcc_config} | awk '{print $3}')
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2009-12-20 19:06 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2009-12-20 19:06 UTC (permalink / raw
To: gentoo-commits
vapier 09/12/20 19:06:55
Modified: toolchain.eclass
Log:
when upgrading in same slot, run gcc-config earlier to make sure the profile is sane for fix_libtool_files to probe gcc
Revision Changes Path
1.415 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.415&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.415&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.414&r2=1.415
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.414
retrieving revision 1.415
diff -u -r1.414 -r1.415
--- toolchain.eclass 20 Dec 2009 14:30:03 -0000 1.414
+++ toolchain.eclass 20 Dec 2009 19:06:55 -0000 1.415
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.414 2009/12/20 14:30:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.415 2009/12/20 19:06:55 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -974,6 +974,9 @@
[[ ${ROOT} != "/" ]] && return 0
if [[ ! -e ${LIBPATH}/libstdc++.so ]] ; then
+ # make sure the profile is sane during same-slot upgrade #289403
+ do_gcc_config
+
einfo "Running 'fix_libtool_files.sh ${GCC_RELEASE_VER}'"
/sbin/fix_libtool_files.sh ${GCC_RELEASE_VER}
if [[ -n ${BRANCH_UPDATE} ]] ; then
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2010-01-09 20:42 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2010-01-09 20:42 UTC (permalink / raw
To: gentoo-commits
vapier 10/01/09 20:42:19
Modified: toolchain.eclass
Log:
move ip28/ip32r10k to the one ebuild using them #299985
Revision Changes Path
1.416 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.416&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.416&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.415&r2=1.416
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.415
retrieving revision 1.416
diff -u -r1.415 -r1.416
--- toolchain.eclass 20 Dec 2009 19:06:55 -0000 1.415
+++ toolchain.eclass 9 Jan 2010 20:42:19 -0000 1.416
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.415 2009/12/20 19:06:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.416 2010/01/09 20:42:19 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -151,7 +151,7 @@
# gcc-{nios2,bfin} don't accept these
if [[ ${PN} == "gcc" ]] ; then
- IUSE="${IUSE} ip28 ip32r10k n32 n64"
+ IUSE="${IUSE} n32 n64"
fi
tc_version_is_at_least "4.0" && IUSE="${IUSE} objc-gc mudflap"
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2010-02-27 20:54 Mark Loeser (halcy0n)
0 siblings, 0 replies; 266+ messages in thread
From: Mark Loeser (halcy0n) @ 2010-02-27 20:54 UTC (permalink / raw
To: gentoo-commits
halcy0n 10/02/27 20:54:35
Modified: toolchain.eclass
Log:
Use --with-arch for arm now as well. Thanks to Raúl Porcel <armin76 AT gentoo DOT org>; bug #264534
Revision Changes Path
1.417 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.417&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.417&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.416&r2=1.417
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.416
retrieving revision 1.417
diff -u -r1.416 -r1.417
--- toolchain.eclass 9 Jan 2010 20:42:19 -0000 1.416
+++ toolchain.eclass 27 Feb 2010 20:54:35 -0000 1.417
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.416 2010/01/09 20:42:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.417 2010/02/27 20:54:35 halcy0n Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1230,6 +1230,17 @@
fi
case $(tc-arch) in
+ # bug #264534
+ arm)
+ local arm_arch="${CTARGET%%-*}"
+ # Convert armv7{a,r,m} to armv7-{a,r,m}
+ [[ ! -z "${arm_arch##armv7}" ]] && arm_arch="${arm_arch/armv7/armv7-}"
+ # Remove 'l'
+ [[ -z "${arm_arch##armv*l}" ]] && arch="${arm_arch/l/}"
+ # Remove 'eb'
+ [[ -z "${arm_arch##armv*eb}" ]] && arch="${arm_arch/eb/}"
+ confgcc="${confgcc} --with-arch=${arm_arch}"
+ ;;
# Add --with-abi flags to set default MIPS ABI
mips)
local mips_abi=""
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2010-02-28 18:26 Raul Porcel (armin76)
0 siblings, 0 replies; 266+ messages in thread
From: Raul Porcel (armin76) @ 2010-02-28 18:26 UTC (permalink / raw
To: gentoo-commits
armin76 10/02/28 18:26:54
Modified: toolchain.eclass
Log:
Typo
Revision Changes Path
1.418 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.418&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.418&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.417&r2=1.418
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.417
retrieving revision 1.418
diff -u -r1.417 -r1.418
--- toolchain.eclass 27 Feb 2010 20:54:35 -0000 1.417
+++ toolchain.eclass 28 Feb 2010 18:26:53 -0000 1.418
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.417 2010/02/27 20:54:35 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.418 2010/02/28 18:26:53 armin76 Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1236,9 +1236,9 @@
# Convert armv7{a,r,m} to armv7-{a,r,m}
[[ ! -z "${arm_arch##armv7}" ]] && arm_arch="${arm_arch/armv7/armv7-}"
# Remove 'l'
- [[ -z "${arm_arch##armv*l}" ]] && arch="${arm_arch/l/}"
+ [[ -z "${arm_arch##armv*l}" ]] && arm_arch="${arm_arch/l/}"
# Remove 'eb'
- [[ -z "${arm_arch##armv*eb}" ]] && arch="${arm_arch/eb/}"
+ [[ -z "${arm_arch##armv*eb}" ]] && arm_arch="${arm_arch/eb/}"
confgcc="${confgcc} --with-arch=${arm_arch}"
;;
# Add --with-abi flags to set default MIPS ABI
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2010-03-06 14:50 Raul Porcel (armin76)
0 siblings, 0 replies; 266+ messages in thread
From: Raul Porcel (armin76) @ 2010-03-06 14:50 UTC (permalink / raw
To: gentoo-commits
armin76 10/03/06 14:50:02
Modified: toolchain.eclass
Log:
Don't do the --with-arch thing if arm_arch isn't armv*, as it breaks arm{,eb}-{softfloat,unknown}...
Revision Changes Path
1.419 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.419&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.419&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.418&r2=1.419
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.418
retrieving revision 1.419
diff -u -r1.418 -r1.419
--- toolchain.eclass 28 Feb 2010 18:26:53 -0000 1.418
+++ toolchain.eclass 6 Mar 2010 14:50:02 -0000 1.419
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.418 2010/02/28 18:26:53 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.419 2010/03/06 14:50:02 armin76 Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1233,13 +1233,16 @@
# bug #264534
arm)
local arm_arch="${CTARGET%%-*}"
- # Convert armv7{a,r,m} to armv7-{a,r,m}
- [[ ! -z "${arm_arch##armv7}" ]] && arm_arch="${arm_arch/armv7/armv7-}"
- # Remove 'l'
- [[ -z "${arm_arch##armv*l}" ]] && arm_arch="${arm_arch/l/}"
- # Remove 'eb'
- [[ -z "${arm_arch##armv*eb}" ]] && arm_arch="${arm_arch/eb/}"
- confgcc="${confgcc} --with-arch=${arm_arch}"
+ # Only do this if arm_arch is armv*
+ if [[ -z "${arm_arch##armv*}" ]]; then
+ # Convert armv7{a,r,m} to armv7-{a,r,m}
+ [[ ! -z "${arm_arch##armv7}" ]] && arm_arch="${arm_arch/armv7/armv7-}"
+ # Remove 'l'
+ [[ -z "${arm_arch##armv*l}" ]] && arm_arch="${arm_arch/l/}"
+ # Remove 'eb'
+ [[ -z "${arm_arch##armv*eb}" ]] && arm_arch="${arm_arch/eb/}"
+ confgcc="${confgcc} --with-arch=${arm_arch}"
+ fi
;;
# Add --with-abi flags to set default MIPS ABI
mips)
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2010-03-07 4:37 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2010-03-07 4:37 UTC (permalink / raw
To: gentoo-commits
vapier 10/03/07 04:37:01
Modified: toolchain.eclass
Log:
simplify arm --with-arch cruft
Revision Changes Path
1.420 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.420&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.420&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.419&r2=1.420
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.419
retrieving revision 1.420
diff -u -r1.419 -r1.420
--- toolchain.eclass 6 Mar 2010 14:50:02 -0000 1.419
+++ toolchain.eclass 7 Mar 2010 04:37:01 -0000 1.420
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.419 2010/03/06 14:50:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.420 2010/03/07 04:37:01 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1230,17 +1230,15 @@
fi
case $(tc-arch) in
- # bug #264534
- arm)
+ arm) #264534
local arm_arch="${CTARGET%%-*}"
# Only do this if arm_arch is armv*
- if [[ -z "${arm_arch##armv*}" ]]; then
+ if [[ ${arm_arch} == armv* ]] ; then
# Convert armv7{a,r,m} to armv7-{a,r,m}
- [[ ! -z "${arm_arch##armv7}" ]] && arm_arch="${arm_arch/armv7/armv7-}"
- # Remove 'l'
- [[ -z "${arm_arch##armv*l}" ]] && arm_arch="${arm_arch/l/}"
- # Remove 'eb'
- [[ -z "${arm_arch##armv*eb}" ]] && arm_arch="${arm_arch/eb/}"
+ [[ ${arm_arch} == armv7? ]] && arm_arch=${arm_arch/7/7-}
+ # Remove endian ('l' / 'eb')
+ [[ ${arm_arch} == *l ]] && arm_arch=${arm_arch%l}
+ [[ ${arm_arch} == *eb ]] && arm_arch=${arm_arch%eb}
confgcc="${confgcc} --with-arch=${arm_arch}"
fi
;;
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2010-04-03 20:32 Ryan Hill (dirtyepic)
0 siblings, 0 replies; 266+ messages in thread
From: Ryan Hill (dirtyepic) @ 2010-04-03 20:32 UTC (permalink / raw
To: gentoo-commits
dirtyepic 10/04/03 20:32:47
Modified: toolchain.eclass
Log:
Add -0 to xargs since input is NULL delimited. Thanks to Dror for catching.
Revision Changes Path
1.421 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.421&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.421&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.420&r2=1.421
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.420
retrieving revision 1.421
diff -u -r1.420 -r1.421
--- toolchain.eclass 7 Mar 2010 04:37:01 -0000 1.420
+++ toolchain.eclass 3 Apr 2010 20:32:47 -0000 1.421
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.420 2010/03/07 04:37:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.421 2010/04/03 20:32:47 dirtyepic Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1750,7 +1750,7 @@
cd "${WORKDIR}"/build
# Do allow symlinks in private gcc include dir as this can break the build
- find gcc/include*/ -type l -print0 | xargs rm -f
+ find gcc/include*/ -type l -print0 | xargs -0 rm -f
# Remove generated headers, as they can cause things to break
# (ncurses, openssl, etc).
for x in $(find gcc/include*/ -name '*.h') ; do
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2010-04-20 17:47 Raul Porcel (armin76)
0 siblings, 0 replies; 266+ messages in thread
From: Raul Porcel (armin76) @ 2010-04-20 17:47 UTC (permalink / raw
To: gentoo-commits
armin76 10/04/20 17:47:09
Modified: toolchain.eclass
Log:
Enable hardvfp if *eabi, if *hardfloat*, if gcc-4.5 and if arm, bug #315987, acked by vapier
Revision Changes Path
1.422 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.422&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.422&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.421&r2=1.422
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.421
retrieving revision 1.422
diff -u -r1.421 -r1.422
--- toolchain.eclass 3 Apr 2010 20:32:47 -0000 1.421
+++ toolchain.eclass 20 Apr 2010 17:47:09 -0000 1.422
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.421 2010/04/03 20:32:47 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.422 2010/04/20 17:47:09 armin76 Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1241,6 +1241,12 @@
[[ ${arm_arch} == *eb ]] && arm_arch=${arm_arch%eb}
confgcc="${confgcc} --with-arch=${arm_arch}"
fi
+
+ # Enable hardvfp
+ if [[ ${CTARGET##*-} == *eabi ]] && [[ $(tc-is-softfloat) == no ]] && \
+ tc_version_is_at_least "4.5" ; then
+ confgcc="${confgcc} --with-float=hard"
+ fi
;;
# Add --with-abi flags to set default MIPS ABI
mips)
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2010-04-23 18:58 Raul Porcel (armin76)
0 siblings, 0 replies; 266+ messages in thread
From: Raul Porcel (armin76) @ 2010-04-23 18:58 UTC (permalink / raw
To: gentoo-commits
armin76 10/04/23 18:58:06
Modified: toolchain.eclass
Log:
Use hardfloat only if hardfloat is true
Revision Changes Path
1.423 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.423&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.423&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.422&r2=1.423
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.422
retrieving revision 1.423
diff -u -r1.422 -r1.423
--- toolchain.eclass 20 Apr 2010 17:47:09 -0000 1.422
+++ toolchain.eclass 23 Apr 2010 18:58:06 -0000 1.423
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.422 2010/04/20 17:47:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.423 2010/04/23 18:58:06 armin76 Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1241,9 +1241,9 @@
[[ ${arm_arch} == *eb ]] && arm_arch=${arm_arch%eb}
confgcc="${confgcc} --with-arch=${arm_arch}"
fi
-
+
# Enable hardvfp
- if [[ ${CTARGET##*-} == *eabi ]] && [[ $(tc-is-softfloat) == no ]] && \
+ if [[ ${CTARGET##*-} == *eabi ]] && [[ $(tc-is-hardfloat) == yes ]] && \
tc_version_is_at_least "4.5" ; then
confgcc="${confgcc} --with-float=hard"
fi
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2010-04-24 23:53 Mark Loeser (halcy0n)
0 siblings, 0 replies; 266+ messages in thread
From: Mark Loeser (halcy0n) @ 2010-04-24 23:53 UTC (permalink / raw
To: gentoo-commits
halcy0n 10/04/24 23:53:14
Modified: toolchain.eclass
Log:
Add in lto use flag, and cleaning up of python scripts for gcc-4.5
Revision Changes Path
1.424 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.424&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.424&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.423&r2=1.424
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.423
retrieving revision 1.424
diff -u -r1.423 -r1.424
--- toolchain.eclass 23 Apr 2010 18:58:06 -0000 1.423
+++ toolchain.eclass 24 Apr 2010 23:53:14 -0000 1.424
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.423 2010/04/23 18:58:06 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.424 2010/04/24 23:53:14 halcy0n Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -159,6 +159,7 @@
tc_version_is_at_least "4.2" && IUSE="${IUSE} openmp"
tc_version_is_at_least "4.3" && IUSE="${IUSE} fixed-point"
tc_version_is_at_least "4.4" && IUSE="${IUSE} graphite"
+ tc_version_is_at_least "4.5" && IUSE="${IUSE} lto"
fi
fi
@@ -1351,6 +1352,11 @@
tc_version_is_at_least "4.4" && \
confgcc="${confgcc} $(use_with graphite ppl) $(use_with graphite cloog)"
+ # lto support was added in 4.5, which depends upon elfutils. This allows
+ # users to enable that option, and pull in the additional library
+ tc_version_is_at_least "4.5" && \
+ confgcc="${confgcc} $(use_enable lto)"
+
[[ $(tc-is-softfloat) == "yes" ]] && confgcc="${confgcc} --with-float=soft"
@@ -1913,6 +1919,15 @@
# Cpoy the needed minispec for hardened gcc 4
copy_minispecs_gcc_specs
+
+ # Move pretty-printers to gdb datadir to shut ldconfig up
+ gdbdir=/usr/share/gdb/auto-load
+ for module in $(find "${D}" -iname "*-gdb.py" -print); do
+ insinto ${gdbdir}/$(dirname "${module/${D}/}" | \
+ sed -e "s:/lib/:/$(get_libdir)/:g")
+ doins "${module}"
+ rm "${module}"
+ done
}
gcc_slot_java() {
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2010-04-25 18:04 Raul Porcel (armin76)
0 siblings, 0 replies; 266+ messages in thread
From: Raul Porcel (armin76) @ 2010-04-25 18:04 UTC (permalink / raw
To: gentoo-commits
armin76 10/04/25 18:04:48
Modified: toolchain.eclass
Log:
Add support for hardfloat toolchains, acked by vapier
Revision Changes Path
1.425 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.425&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.425&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.424&r2=1.425
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.424
retrieving revision 1.425
diff -u -r1.424 -r1.425
--- toolchain.eclass 24 Apr 2010 23:53:14 -0000 1.424
+++ toolchain.eclass 25 Apr 2010 18:04:48 -0000 1.425
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.424 2010/04/24 23:53:14 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.425 2010/04/25 18:04:48 armin76 Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1359,6 +1359,7 @@
[[ $(tc-is-softfloat) == "yes" ]] && confgcc="${confgcc} --with-float=soft"
+ [[ $(tc-is-hardfloat) == "yes" ]] && confgcc="${confgcc} --with-float=hard"
# Native Language Support
if use nls ; then
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2010-05-25 23:24 Ryan Hill (dirtyepic)
0 siblings, 0 replies; 266+ messages in thread
From: Ryan Hill (dirtyepic) @ 2010-05-25 23:24 UTC (permalink / raw
To: gentoo-commits
dirtyepic 10/05/25 23:24:18
Modified: toolchain.eclass
Log:
Document the insanity that is --with-python-dir a bit better as requested by darkside.
Revision Changes Path
1.426 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.426&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.426&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.425&r2=1.426
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.425
retrieving revision 1.426
diff -u -r1.425 -r1.426
--- toolchain.eclass 25 Apr 2010 18:04:48 -0000 1.425
+++ toolchain.eclass 25 May 2010 23:24:18 -0000 1.426
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.425 2010/04/25 18:04:48 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.426 2010/05/25 23:24:18 dirtyepic Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1216,6 +1216,14 @@
# Stick the python scripts in their own slotted directory
# bug #279252
+ #
+ # --with-python-dir=DIR
+ # Specifies where to install the Python modules used for aot-compile. DIR
+ # should not include the prefix used in installation. For example, if the
+ # Python modules are to be installed in /usr/lib/python2.5/site-packages,
+ # then –with-python-dir=/lib/python2.5/site-packages should be passed.
+ #
+ # This should translate into "/share/gcc-data/${CTARGET}/${GCC_CONFIG_VER}/python"
if tc_version_is_at_least "4.4" ; then
confgcc="${confgcc} --with-python-dir=${DATAPATH/$PREFIX/}/python"
fi
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2010-06-02 21:31 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2010-06-02 21:31 UTC (permalink / raw
To: gentoo-commits
vapier 10/06/02 21:31:12
Modified: toolchain.eclass
Log:
add mint support #321827 by Alan Hourihane
Revision Changes Path
1.427 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.427&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.427&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.426&r2=1.427
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.426
retrieving revision 1.427
diff -u -r1.426 -r1.427
--- toolchain.eclass 25 May 2010 23:24:18 -0000 1.426
+++ toolchain.eclass 2 Jun 2010 21:31:12 -0000 1.427
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.426 2010/05/25 23:24:18 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.427 2010/06/02 21:31:12 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1421,10 +1421,20 @@
if [[ ${GCCMAJOR}.${GCCMINOR} > 4.1 ]] ; then
confgcc="${confgcc} --disable-bootstrap --disable-libgomp"
fi
- elif [[ ${CHOST} == mingw* ]] || [[ ${CHOST} == *-mingw* ]] || [[ ${CHOST} == *-cygwin ]] ; then
- confgcc="${confgcc} --enable-shared --enable-threads=win32"
else
- confgcc="${confgcc} --enable-shared --enable-threads=posix"
+ if tc-is-static-only ; then
+ confgcc="${confgcc} --disable-shared"
+ else
+ confgcc="${confgcc} --enable-shared"
+ fi
+ case ${CHOST} in
+ mingw*|*-mingw*|*-cygwin)
+ confgcc="${confgcc} --enable-threads=win32" ;;
+ *-mint*)
+ confgcc="${confgcc} --disable-threads" ;;
+ *)
+ confgcc="${confgcc} --enable-threads=posix" ;;
+ esac
fi
[[ ${CTARGET} == *-elf ]] && confgcc="${confgcc} --with-newlib"
# __cxa_atexit is "essential for fully standards-compliant handling of
@@ -2549,8 +2559,8 @@
case ${CTARGET} in
mips64*|powerpc64*|s390x*|sparc*|x86_64*)
has_multilib_profile || use multilib ;;
- *-*-solaris*) use multilib ;;
- *-apple-darwin*) use multilib ;;
+ *-*-solaris*|*-apple-darwin*|*-mint*)
+ use multilib ;;
*) false ;;
esac
}
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2010-06-18 1:03 Magnus Granberg (zorry)
0 siblings, 0 replies; 266+ messages in thread
From: Magnus Granberg (zorry) @ 2010-06-18 1:03 UTC (permalink / raw
To: gentoo-commits
zorry 10/06/18 01:03:12
Modified: toolchain.eclass
Log:
Add support for full hardened on >=gcc 4.4 bug #318171
Revision Changes Path
1.428 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.428&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.428&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.427&r2=1.428
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.427
retrieving revision 1.428
diff -u -r1.427 -r1.428
--- toolchain.eclass 2 Jun 2010 21:31:12 -0000 1.427
+++ toolchain.eclass 18 Jun 2010 01:03:12 -0000 1.428
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.427 2010/06/02 21:31:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.428 2010/06/18 01:03:12 zorry Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -143,6 +143,7 @@
IUSE="${IUSE} altivec build fortran nls nocxx"
[[ -n ${PIE_VER} ]] && IUSE="${IUSE} nopie"
[[ -n ${PP_VER} ]] && IUSE="${IUSE} nossp"
+ [[ -n ${SPECS_VER} ]] && IUSE="${IUSE} nossp"
[[ -n ${HTB_VER} ]] && IUSE="${IUSE} boundschecking"
[[ -n ${D_VER} ]] && IUSE="${IUSE} d"
@@ -243,6 +244,14 @@
# SPECS_VER
# SPECS_GCC_VER
# This is for the minispecs files included in the hardened gcc-4.x
+# The specs files for hardenedno*, vanilla and for building the "specs" file.
+# SPECS_VER is expected to be the version of this patch, SPECS_GCC_VER
+# the gcc version of the patch.
+# An example:
+# SPECS_VER="8.7.6.5"
+# SPECS_GCC_VER="3.4.0"
+# The resulting filename of this tarball will be:
+# gcc-${SPECS_GCC_VER:-${GCC_RELEASE_VER}}-specs-${SPECS_VER}.tar.bz2
#
# PP_VER
# PP_GCC_VER
@@ -278,7 +287,7 @@
#
gentoo_urls() {
local devspace="HTTP~lv/GCC/URI HTTP~eradicator/gcc/URI HTTP~vapier/dist/URI
- HTTP~halcy0n/patches/URI"
+ HTTP~halcy0n/patches/URI HTTP~zorry/patches/gcc/URI"
devspace=${devspace//HTTP/http:\/\/dev.gentoo.org\/}
echo mirror://gentoo/$1 ${devspace//URI/$1}
}
@@ -290,9 +299,6 @@
export HTB_GCC_VER=${HTB_GCC_VER:-${GCC_RELEASE_VER}}
export SPECS_GCC_VER=${SPECS_GCC_VER:-${GCC_RELEASE_VER}}
- [[ -n ${PIE_VER} ]] && \
- PIE_CORE=${PIE_CORE:-gcc-${PIE_GCC_VER}-piepatches-v${PIE_VER}.tar.bz2}
-
# Set where to download gcc itself depending on whether we're using a
# prerelease, snapshot, or release tarball.
if [[ -n ${PRERELEASE} ]] ; then
@@ -334,11 +340,12 @@
# strawberry pie, Cappuccino and a Gauloises (it's a good thing)
[[ -n ${PIE_VER} ]] && \
- GCC_SRC_URI="${GCC_SRC_URI} !nopie? ( $(gentoo_urls ${PIE_CORE}) )"
-
+ PIE_CORE=${PIE_CORE:-gcc-${PIE_GCC_VER}-piepatches-v${PIE_VER}.tar.bz2} && \
+ GCC_SRC_URI="${GCC_SRC_URI} $(gentoo_urls ${PIE_CORE})"
+
# gcc minispec for the hardened gcc 4 compiler
[[ -n ${SPECS_VER} ]] && \
- GCC_SRC_URI="${GCC_SRC_URI} !nopie? ( $(gentoo_urls gcc-${SPECS_GCC_VER}-specs-${SPECS_VER}.tar.bz2) )"
+ GCC_SRC_URI="${GCC_SRC_URI} $(gentoo_urls gcc-${SPECS_GCC_VER}-specs-${SPECS_VER}.tar.bz2)"
# gcc bounds checking patch
if [[ -n ${HTB_VER} ]] ; then
@@ -392,6 +399,7 @@
[[ ${CTARGET} == *-freebsd* ]] && return 1
want_pie || return 1
+ tc_version_is_at_least 4.3.2 && use nopie && return 1
hardened_gcc_is_stable pie && return 0
if has "~$(tc-arch)" ${ACCEPT_KEYWORDS} ; then
hardened_gcc_check_unsupported pie && return 1
@@ -400,7 +408,8 @@
fi
return 1
elif [[ $1 == "ssp" ]] ; then
- [[ -z ${PP_VER} ]] && return 1
+ [[ -n ${PP_VER} ]] || [[ -n ${SPECS_VER} ]] || return 1
+ tc_version_is_at_least 4.3.2 && use nossp && return 1
hardened_gcc_is_stable ssp && return 0
if has "~$(tc-arch)" ${ACCEPT_KEYWORDS} ; then
hardened_gcc_check_unsupported ssp && return 1
@@ -490,7 +499,12 @@
return 1
}
want_boundschecking() { _want_stuff HTB_VER boundschecking ; }
-want_pie() { _want_stuff PIE_VER !nopie ; }
+want_pie() {
+ ! use hardened && [[ -n ${PIE_VER} ]] && use nopie && return 1
+ [[ -n ${PIE_VER} ]] && [[ -n ${SPECS_VER} ]] && return 0
+ tc_version_is_at_least 4.3.2 && return 1
+ _want_stuff PIE_VER !nopie
+}
want_ssp() { _want_stuff PP_VER !nossp ; }
want_split_specs() {
@@ -498,11 +512,19 @@
}
want_minispecs() {
if tc_version_is_at_least 4.3.2 && use hardened ; then
- if [[ -n ${SPECS_VER} ]] ; then
- return 0
+ if ! want_pie ; then
+ ewarn "PIE_VER or SPECS_VER is not defiend in the GCC ebuild."
+ elif use vanilla ; then
+ ewarn "You will not get hardened features if you have the vanilla USE-flag."
+ elif use nopie && use nossp ; then
+ ewarn "You will not get hardened features if you have the nopie and nossp USE-flag."
+ elif ! hardened_gcc_works pie && ! hardened_gcc_works ssp && ! use nopie ; then
+ ewarn "Your $(tc-arch) arch is not supported."
else
- die "For Hardened to work you need the minispecs files"
+ return 0
fi
+ ewarn "Hope you know what you are doing. Hardened will not work."
+ return 0
fi
return 1
}
@@ -708,27 +730,42 @@
[[ -n ${gcc_specs_file} ]] && echo "GCC_SPECS=\"${gcc_specs_file}\"" >> ${gcc_envd_file}
}
setup_minispecs_gcc_build_specs() {
- # Setup the "build.specs" file for gcc to use when building.
- if want_minispecs ; then
- if hardened_gcc_works pie ; then
- cat "${WORKDIR}"/specs/pie.specs >> "${WORKDIR}"/build.specs
- fi
- for s in nostrict znow; do
+ # Setup the "build.specs" file for gcc 4.3 to use when building.
+ if hardened_gcc_works pie ; then
+ cat "${WORKDIR}"/specs/pie.specs >> "${WORKDIR}"/build.specs
+ fi
+ if hardened_gcc_works ssp ; then
+ for s in ssp sspall ; do
cat "${WORKDIR}"/specs/${s}.specs >> "${WORKDIR}"/build.specs
done
- export GCC_SPECS="${WORKDIR}"/build.specs
fi
+ for s in nostrict znow ; do
+ cat "${WORKDIR}"/specs/${s}.specs >> "${WORKDIR}"/build.specs
+ done
+ export GCC_SPECS="${WORKDIR}"/build.specs
}
copy_minispecs_gcc_specs() {
+ # setup the hardenedno* specs files and the vanilla specs file.
+ if hardened_gcc_works ; then
+ create_gcc_env_entry hardenednopiessp
+ fi
+ if hardened_gcc_works pie ; then
+ create_gcc_env_entry hardenednopie
+ fi
+ if hardened_gcc_works ssp ; then
+ create_gcc_env_entry hardenednossp
+ fi
+ create_gcc_env_entry vanilla
+ insinto ${LIBPATH}
+ doins "${WORKDIR}"/specs/*.specs || die "failed to install specs"
# Build system specs file which, if it exists, must be a complete set of
# specs as it completely and unconditionally overrides the builtin specs.
- # For gcc 4
- if use hardened && want_minispecs ; then
+ # For gcc 4.3
+ if ! tc_version_is_at_least 4.4 ; then
$(XGCC) -dumpspecs > "${WORKDIR}"/specs/specs
cat "${WORKDIR}"/build.specs >> "${WORKDIR}"/specs/specs
- insinto ${LIBPATH}
- doins "${WORKDIR}"/specs/* || die "failed to install specs"
- fi
+ doins "${WORKDIR}"/specs/specs || die "failed to install the specs file"
+ fi
}
add_profile_eselect_conf() {
local compiler_config_file=$1
@@ -885,6 +922,7 @@
want_libssp && libc_has_ssp && \
die "libssp cannot be used with a glibc that has been patched to provide ssp symbols"
+ want_minispecs
unset LANGUAGES #265283
}
@@ -1010,7 +1048,7 @@
# the necessary support
want_pie && use hardened && glibc_have_pie
- if use hardened && ! want_minispecs ; then
+ if use hardened ; then
einfo "updating configuration to build hardened GCC"
make_gcc_hard || die "failed to make gcc hard"
fi
@@ -1201,6 +1239,11 @@
confgcc="${confgcc} --disable-libssp"
fi
+ # If we want hardened support with the newer piepatchset for >=gcc 4.4
+ if tc_version_is_at_least 4.4 && want_minispecs ; then
+ confgcc="${confgcc} $(use_enable hardened esp)"
+ fi
+
if tc_version_is_at_least "4.2" ; then
confgcc="${confgcc} $(use_enable openmp libgomp)"
fi
@@ -1700,9 +1743,11 @@
einfo "CFLAGS=\"${CFLAGS}\""
einfo "CXXFLAGS=\"${CXXFLAGS}\""
- # For hardened gcc 4 for build the hardened specs file to use when building gcc
- setup_minispecs_gcc_build_specs
-
+ # For hardened gcc 4.3 piepatchset to build the hardened specs
+ # file (build.specs) to use when building gcc.
+ if ! tc_version_is_at_least 4.4 && want_minispecs ; then
+ setup_minispecs_gcc_build_specs
+ fi
# Build in a separate build tree
mkdir -p "${WORKDIR}"/build
pushd "${WORKDIR}"/build > /dev/null
@@ -1827,10 +1872,7 @@
fi
# Setup the gcc_env_entry for hardened gcc 4 with minispecs
if want_minispecs ; then
- if hardened_gcc_works pie ; then
- create_gcc_env_entry hardenednopie
- fi
- create_gcc_env_entry vanilla
+ copy_minispecs_gcc_specs
fi
# Make sure we dont have stuff lying around that
# can nuke multiple versions of gcc
@@ -1936,9 +1978,6 @@
# Create config files for eselect-compiler
create_eselect_conf
- # Cpoy the needed minispec for hardened gcc 4
- copy_minispecs_gcc_specs
-
# Move pretty-printers to gdb datadir to shut ldconfig up
gdbdir=/usr/share/gdb/auto-load
for module in $(find "${D}" -iname "*-gdb.py" -print); do
@@ -2289,13 +2328,12 @@
# adds default pie support (rs6000 too) if DEFAULT_PIE[_SSP] is defined
EPATCH_MULTI_MSG="Applying default pie patches ..." \
epatch "${WORKDIR}"/piepatch/def
-
+ fi
# we want to be able to control the pie patch logic via something other
# than ALL_CFLAGS...
sed -e '/^ALL_CFLAGS/iHARD_CFLAGS = ' \
-e 's|^ALL_CFLAGS = |ALL_CFLAGS = $(HARD_CFLAGS) |' \
-i "${S}"/gcc/Makefile.in
- fi
BRANDING_GCC_PKGVERSION="${BRANDING_GCC_PKGVERSION}, pie-${PIE_VER}"
}
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2010-06-18 10:13 Magnus Granberg (zorry)
0 siblings, 0 replies; 266+ messages in thread
From: Magnus Granberg (zorry) @ 2010-06-18 10:13 UTC (permalink / raw
To: gentoo-commits
zorry 10/06/18 10:13:17
Modified: toolchain.eclass
Log:
Move IUSE SPECS_VER and nossp to gcc 4.4
Revision Changes Path
1.429 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.429&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.429&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.428&r2=1.429
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.428
retrieving revision 1.429
diff -u -r1.428 -r1.429
--- toolchain.eclass 18 Jun 2010 01:03:12 -0000 1.428
+++ toolchain.eclass 18 Jun 2010 10:13:17 -0000 1.429
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.428 2010/06/18 01:03:12 zorry Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.429 2010/06/18 10:13:17 zorry Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -159,7 +159,10 @@
tc_version_is_at_least "4.1" && IUSE="${IUSE} objc++"
tc_version_is_at_least "4.2" && IUSE="${IUSE} openmp"
tc_version_is_at_least "4.3" && IUSE="${IUSE} fixed-point"
- tc_version_is_at_least "4.4" && IUSE="${IUSE} graphite"
+ if tc_version_is_at_least "4.4" ; then
+ IUSE="${IUSE} graphite"
+ [[ -n ${SPECS_VER} ]] && IUSE="${IUSE} nossp"
+ fi
tc_version_is_at_least "4.5" && IUSE="${IUSE} lto"
fi
fi
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2010-06-20 5:04 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2010-06-20 5:04 UTC (permalink / raw
To: gentoo-commits
vapier 10/06/20 05:04:01
Modified: toolchain.eclass
Log:
respect USE=openmp even when cross-compiling #199995 by Quentin Casasnovas
Revision Changes Path
1.430 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.430&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.430&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.429&r2=1.430
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.429
retrieving revision 1.430
diff -u -r1.429 -r1.430
--- toolchain.eclass 18 Jun 2010 10:13:17 -0000 1.429
+++ toolchain.eclass 20 Jun 2010 05:04:01 -0000 1.430
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.429 2010/06/18 10:13:17 zorry Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.430 2010/06/20 05:04:01 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1465,7 +1465,7 @@
fi
if [[ ${GCCMAJOR}.${GCCMINOR} > 4.1 ]] ; then
- confgcc="${confgcc} --disable-bootstrap --disable-libgomp"
+ confgcc="${confgcc} --disable-bootstrap"
fi
else
if tc-is-static-only ; then
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2010-06-27 3:54 Ryan Hill (dirtyepic)
0 siblings, 0 replies; 266+ messages in thread
From: Ryan Hill (dirtyepic) @ 2010-06-27 3:54 UTC (permalink / raw
To: gentoo-commits
dirtyepic 10/06/27 03:54:36
Modified: toolchain.eclass
Log:
Add my distdir.
Revision Changes Path
1.431 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.431&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.431&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.430&r2=1.431
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.430
retrieving revision 1.431
diff -u -r1.430 -r1.431
--- toolchain.eclass 20 Jun 2010 05:04:01 -0000 1.430
+++ toolchain.eclass 27 Jun 2010 03:54:36 -0000 1.431
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.430 2010/06/20 05:04:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.431 2010/06/27 03:54:36 dirtyepic Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -290,7 +290,7 @@
#
gentoo_urls() {
local devspace="HTTP~lv/GCC/URI HTTP~eradicator/gcc/URI HTTP~vapier/dist/URI
- HTTP~halcy0n/patches/URI HTTP~zorry/patches/gcc/URI"
+ HTTP~halcy0n/patches/URI HTTP~zorry/patches/gcc/URI HTTP~dirtyepic/dist/URI"
devspace=${devspace//HTTP/http:\/\/dev.gentoo.org\/}
echo mirror://gentoo/$1 ${devspace//URI/$1}
}
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2010-07-04 1:44 Magnus Granberg (zorry)
0 siblings, 0 replies; 266+ messages in thread
From: Magnus Granberg (zorry) @ 2010-07-04 1:44 UTC (permalink / raw
To: gentoo-commits
zorry 10/07/04 01:44:11
Modified: toolchain.eclass
Log:
fix #326753 thanks vapier
Revision Changes Path
1.432 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.432&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.432&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.431&r2=1.432
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.431
retrieving revision 1.432
diff -u -r1.431 -r1.432
--- toolchain.eclass 27 Jun 2010 03:54:36 -0000 1.431
+++ toolchain.eclass 4 Jul 2010 01:44:11 -0000 1.432
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.431 2010/06/27 03:54:36 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.432 2010/07/04 01:44:11 zorry Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -510,7 +510,9 @@
}
want_ssp() { _want_stuff PP_VER !nossp ; }
+# SPLIT_SPECS are deprecated for >=GCC 4.4
want_split_specs() {
+ tc_version_is_at_least 4.4 && return 1
[[ ${SPLIT_SPECS} == "true" ]] && want_pie
}
want_minispecs() {
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2010-07-05 22:22 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2010-07-05 22:22 UTC (permalink / raw
To: gentoo-commits
vapier 10/07/05 22:22:20
Modified: toolchain.eclass
Log:
eat trailing whitespace
Revision Changes Path
1.433 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.433&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.433&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.432&r2=1.433
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.432
retrieving revision 1.433
diff -u -r1.432 -r1.433
--- toolchain.eclass 4 Jul 2010 01:44:11 -0000 1.432
+++ toolchain.eclass 5 Jul 2010 22:22:20 -0000 1.433
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.432 2010/07/04 01:44:11 zorry Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.433 2010/07/05 22:22:20 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -248,7 +248,7 @@
# SPECS_GCC_VER
# This is for the minispecs files included in the hardened gcc-4.x
# The specs files for hardenedno*, vanilla and for building the "specs" file.
-# SPECS_VER is expected to be the version of this patch, SPECS_GCC_VER
+# SPECS_VER is expected to be the version of this patch, SPECS_GCC_VER
# the gcc version of the patch.
# An example:
# SPECS_VER="8.7.6.5"
@@ -345,7 +345,7 @@
[[ -n ${PIE_VER} ]] && \
PIE_CORE=${PIE_CORE:-gcc-${PIE_GCC_VER}-piepatches-v${PIE_VER}.tar.bz2} && \
GCC_SRC_URI="${GCC_SRC_URI} $(gentoo_urls ${PIE_CORE})"
-
+
# gcc minispec for the hardened gcc 4 compiler
[[ -n ${SPECS_VER} ]] && \
GCC_SRC_URI="${GCC_SRC_URI} $(gentoo_urls gcc-${SPECS_GCC_VER}-specs-${SPECS_VER}.tar.bz2)"
@@ -754,10 +754,10 @@
if hardened_gcc_works ; then
create_gcc_env_entry hardenednopiessp
fi
- if hardened_gcc_works pie ; then
+ if hardened_gcc_works pie ; then
create_gcc_env_entry hardenednopie
fi
- if hardened_gcc_works ssp ; then
+ if hardened_gcc_works ssp ; then
create_gcc_env_entry hardenednossp
fi
create_gcc_env_entry vanilla
@@ -770,7 +770,7 @@
$(XGCC) -dumpspecs > "${WORKDIR}"/specs/specs
cat "${WORKDIR}"/build.specs >> "${WORKDIR}"/specs/specs
doins "${WORKDIR}"/specs/specs || die "failed to install the specs file"
- fi
+ fi
}
add_profile_eselect_conf() {
local compiler_config_file=$1
@@ -1267,8 +1267,8 @@
#
# --with-python-dir=DIR
# Specifies where to install the Python modules used for aot-compile. DIR
- # should not include the prefix used in installation. For example, if the
- # Python modules are to be installed in /usr/lib/python2.5/site-packages,
+ # should not include the prefix used in installation. For example, if the
+ # Python modules are to be installed in /usr/lib/python2.5/site-packages,
# then –with-python-dir=/lib/python2.5/site-packages should be passed.
#
# This should translate into "/share/gcc-data/${CTARGET}/${GCC_CONFIG_VER}/python"
@@ -1748,7 +1748,7 @@
einfo "CFLAGS=\"${CFLAGS}\""
einfo "CXXFLAGS=\"${CXXFLAGS}\""
- # For hardened gcc 4.3 piepatchset to build the hardened specs
+ # For hardened gcc 4.3 piepatchset to build the hardened specs
# file (build.specs) to use when building gcc.
if ! tc_version_is_at_least 4.4 && want_minispecs ; then
setup_minispecs_gcc_build_specs
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2010-07-05 22:25 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2010-07-05 22:25 UTC (permalink / raw
To: gentoo-commits
vapier 10/07/05 22:25:09
Modified: toolchain.eclass
Log:
drop old eselect compiler logic
Revision Changes Path
1.434 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.434&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.434&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.433&r2=1.434
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.433
retrieving revision 1.434
diff -u -r1.433 -r1.434
--- toolchain.eclass 5 Jul 2010 22:22:20 -0000 1.433
+++ toolchain.eclass 5 Jul 2010 22:25:09 -0000 1.434
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.433 2010/07/05 22:22:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.434 2010/07/05 22:25:09 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -772,111 +772,6 @@
doins "${WORKDIR}"/specs/specs || die "failed to install the specs file"
fi
}
-add_profile_eselect_conf() {
- local compiler_config_file=$1
- local abi=$2
- local specs=$3
- local gcc_specs_file
- local var
-
- if [[ -z ${specs} ]] ; then
- # I'm leaving the following commented out to remind me that it
- # was an insanely -bad- idea. Stuff broke. GCC_SPECS isnt unset
- # on chroot or in non-toolchain.eclass gcc ebuilds!
- #gcc_specs_file="${LIBPATH}/specs"
- gcc_specs_file=""
-
- if use hardened ; then
- specs="hardened"
- else
- specs="vanilla"
- fi
- else
- gcc_specs_file="${LIBPATH}/${specs}.specs"
- fi
-
- echo >> ${compiler_config_file}
- if ! is_multilib ; then
- echo "[${specs}]" >> ${compiler_config_file}
- echo " ctarget=${CTARGET}" >> ${compiler_config_file}
- else
- echo "[${abi}-${specs}]" >> ${compiler_config_file}
- var="CTARGET_${abi}"
- if [[ -n ${!var} ]] ; then
- echo " ctarget=${!var}" >> ${compiler_config_file}
- else
- var="CHOST_${abi}"
- if [[ -n ${!var} ]] ; then
- echo " ctarget=${!var}" >> ${compiler_config_file}
- else
- echo " ctarget=${CTARGET}" >> ${compiler_config_file}
- fi
- fi
- fi
-
- local MULTIDIR=$($(XGCC) $(get_abi_CFLAGS ${abi}) --print-multi-directory)
- local LDPATH=${LIBPATH}
- if [[ ${MULTIDIR} != "." ]] ; then
- LDPATH="${LIBPATH}/${MULTIDIR}"
- fi
-
- echo " ldpath=${LDPATH}" >> ${compiler_config_file}
-
- if [[ -n ${gcc_specs_file} ]] ; then
- echo " specs=${gcc_specs_file}" >> ${compiler_config_file}
- fi
-
- var="CFLAGS_${abi}"
- if [[ -n ${!var} ]] ; then
- echo " cflags=${!var}" >> ${compiler_config_file}
- fi
-}
-
-create_eselect_conf() {
- local config_dir="/etc/eselect/compiler"
- local compiler_config_file="${D}/${config_dir}/${CTARGET}-${GCC_CONFIG_VER}.conf"
- local abi
-
- dodir ${config_dir}
-
- echo "[global]" > ${compiler_config_file}
- echo " version=${CTARGET}-${GCC_CONFIG_VER}" >> ${compiler_config_file}
- echo " binpath=${BINPATH}" >> ${compiler_config_file}
- echo " manpath=${DATAPATH}/man" >> ${compiler_config_file}
- echo " infopath=${DATAPATH}/info" >> ${compiler_config_file}
- echo " alias_cc=gcc" >> ${compiler_config_file}
- echo " stdcxx_incdir=${STDCXX_INCDIR##*/}" >> ${compiler_config_file}
- echo " bin_prefix=${CTARGET}" >> ${compiler_config_file}
-
- # Per spyderous, it is best not to alias the fortran compilers
- #if [[ -x "${D}/${BINPATH}/${CTARGET}-g77" ]] ; then
- # echo " alias_gfortran=g77" >> ${compiler_config_file}
- #elif [[ -x "${D}/${BINPATH}/${CTARGET}-gfortran" ]] ; then
- # echo " alias_g77=gfortran" >> ${compiler_config_file}
- #fi
-
- for abi in $(get_all_abis) ; do
- add_profile_eselect_conf "${compiler_config_file}" "${abi}"
-
- if want_split_specs ; then
- if use hardened ; then
- add_profile_eselect_conf "${compiler_config_file}" "${abi}" vanilla
- elif hardened_gcc_works ; then
- add_profile_eselect_conf "${compiler_config_file}" "${abi}" hardened
- fi
-
- if hardened_gcc_works || hardened_gcc_works pie ; then
- add_profile_eselect_conf "${compiler_config_file}" "${abi}" hardenednossp
- fi
-
- if hardened_gcc_works || hardened_gcc_works ssp ; then
- add_profile_eselect_conf "${compiler_config_file}" "${abi}" hardenednopie
- fi
-
- add_profile_eselect_conf "${compiler_config_file}" "${abi}" hardenednopiessp
- fi
- done
-}
#----<< specs + env.d logic >>----
@@ -937,11 +832,7 @@
}
gcc-compiler_pkg_postinst() {
- if has_version 'app-admin/eselect-compiler' ; then
- do_eselect_compiler
- else
- do_gcc_config
- fi
+ do_gcc_config
if ! is_crosscompile ; then
echo
@@ -1980,9 +1871,6 @@
# the group 'root' set to gid 0
chown -R root:0 "${D}"${LIBPATH}
- # Create config files for eselect-compiler
- create_eselect_conf
-
# Move pretty-printers to gdb datadir to shut ldconfig up
gdbdir=/usr/share/gdb/auto-load
for module in $(find "${D}" -iname "*-gdb.py" -print); do
@@ -2417,96 +2305,6 @@
gcc-config ${CTARGET}-${GCC_CONFIG_VER}${use_specs}
}
-should_we_eselect_compiler() {
- # we always want to run gcc-config if we're bootstrapping, otherwise
- # we might get stuck with the c-only stage1 compiler
- use bootstrap && return 0
- use build && return 0
-
- # if the current config is invalid, we definitely want a new one
- # Note: due to bash quirkiness, the following must not be 1 line
- local curr_config
- curr_config=$(env -i eselect compiler show ${CTARGET} 2>&1) || return 0
- [[ -z ${curr_config} || ${curr_config} == "(none)" ]] && return 0
-
- # if the previously selected config has the same major.minor (branch) as
- # the version we are installing, then it will probably be uninstalled
- # for being in the same SLOT, make sure we run gcc-config.
- local curr_config_ver=$(echo ${curr_config} | cut -f1 -d/ | awk -F - '{ print $5 }')
- local curr_branch_ver=$(get_version_component_range 1-2 ${curr_config_ver})
-
- # If we're using multislot, just run gcc-config if we're installing
- # to the same profile as the current one.
- use multislot && return $([[ ${curr_config_ver} == ${GCC_CONFIG_VER} ]])
-
- if [[ ${curr_branch_ver} == ${GCC_BRANCH_VER} ]] ; then
- return 0
- else
- # if we're installing a genuinely different compiler version,
- # we should probably tell the user -how- to switch to the new
- # gcc version, since we're not going to do it for him/her.
- # We don't want to switch from say gcc-3.3 to gcc-3.4 right in
- # the middle of an emerge operation (like an 'emerge -e world'
- # which could install multiple gcc versions).
- einfo "The current gcc config appears valid, so it will not be"
- einfo "automatically switched for you. If you would like to"
- einfo "switch to the newly installed gcc version, do the"
- einfo "following:"
- echo
- einfo "eselect compiler set <profile>"
- echo
- ebeep
- return 1
- fi
-}
-
-do_eselect_compiler() {
- if ! should_we_eselect_compiler; then
- eselect compiler update
- return 0
- fi
-
- for abi in $(get_all_abis) ; do
- local ctarget=$(get_abi_CHOST ${abi})
- local current_specs=$(env -i eselect compiler show ${ctarget} | cut -f2 -d/)
-
- if [[ -n ${current_specs} && ${current_specs} != "(none)" ]] && eselect compiler set ${CTARGET}-${GCC_CONFIG_VER}/${current_specs} &> /dev/null; then
- einfo "The following compiler profile has been activated based on your previous profile:"
- einfo "${CTARGET}-${GCC_CONFIG_VER}/${current_specs}"
- else
- # We couldn't choose based on the old specs, so fall back on vanilla/hardened based on USE
-
- local spec
- if use hardened ; then
- spec="hardened"
- else
- spec="vanilla"
- fi
-
- local profile
- local isset=0
- for profile in "${current_specs%-*}-${spec}" "${abi}-${spec}" "${spec}" ; do
- if eselect compiler set ${CTARGET}-${GCC_CONFIG_VER}/${profile} &> /dev/null ; then
- ewarn "The newly installed version of gcc does not have a profile that matches the name of your"
- ewarn "currently selected profile for ${ctarget}, so we have enabled the following instead:"
- ewarn "${CTARGET}-${GCC_CONFIG_VER}/${profile}"
- ewarn "If this is incorrect, please use 'eselect compiler set' to"
- ewarn "select another profile."
-
- isset=1
- break
- fi
- done
-
- if [[ ${isset} == 0 ]] ; then
- eerror "We were not able to automatically set the current compiler for ${ctarget}"
- eerror "to your newly emerged gcc. Please use 'eselect compiler set'"
- eerror "to select your compiler."
- fi
- fi
- done
-}
-
# This function allows us to gentoo-ize gcc's version number and bugzilla
# URL without needing to use patches.
gcc_version_patch() {
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2010-07-21 20:19 Luca Barbato (lu_zero)
0 siblings, 0 replies; 266+ messages in thread
From: Luca Barbato (lu_zero) @ 2010-07-21 20:19 UTC (permalink / raw
To: gentoo-commits
lu_zero 10/07/21 20:19:57
Modified: toolchain.eclass
Log:
Make recent gcc build with --enable-checking=release. Fix bug #317217
Revision Changes Path
1.435 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.435&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.435&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.434&r2=1.435
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.434
retrieving revision 1.435
diff -u -r1.434 -r1.435
--- toolchain.eclass 5 Jul 2010 22:25:09 -0000 1.434
+++ toolchain.eclass 21 Jul 2010 20:19:57 -0000 1.435
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.434 2010/07/05 22:25:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.435 2010/07/21 20:19:57 lu_zero Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1166,6 +1166,14 @@
if tc_version_is_at_least "4.4" ; then
confgcc="${confgcc} --with-python-dir=${DATAPATH/$PREFIX/}/python"
fi
+
+ # For newer versions of gcc, use the default ("release"), because no
+ # one (even upstream apparently) tests with it disabled. #317217
+ if tc_version_is_at_least 4 || [[ -n ${GCC_CHECKS_LIST} ]] ; then
+ confgcc="${confgcc} --enable-checking=${GCC_CHECKS_LIST:-release}"
+ else
+ confgcc="${confgcc} --disable-checking"
+ fi
fi
# GTK+ is preferred over xlib in 3.4.x (xlib is unmaintained
@@ -1318,7 +1326,6 @@
# reasonably sane globals (hopefully)
confgcc="${confgcc} \
--with-system-zlib \
- --disable-checking \
--disable-werror \
--enable-secureplt"
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2010-07-22 1:26 Ryan Hill (dirtyepic)
0 siblings, 0 replies; 266+ messages in thread
From: Ryan Hill (dirtyepic) @ 2010-07-22 1:26 UTC (permalink / raw
To: gentoo-commits
dirtyepic 10/07/22 01:26:33
Modified: toolchain.eclass
Log:
Move outside of 4.0 test so older versions still work properly.
Revision Changes Path
1.436 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.436&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.436&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.435&r2=1.436
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.435
retrieving revision 1.436
diff -u -r1.435 -r1.436
--- toolchain.eclass 21 Jul 2010 20:19:57 -0000 1.435
+++ toolchain.eclass 22 Jul 2010 01:26:33 -0000 1.436
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.435 2010/07/21 20:19:57 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.436 2010/07/22 01:26:33 dirtyepic Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1166,14 +1166,14 @@
if tc_version_is_at_least "4.4" ; then
confgcc="${confgcc} --with-python-dir=${DATAPATH/$PREFIX/}/python"
fi
+ fi
- # For newer versions of gcc, use the default ("release"), because no
- # one (even upstream apparently) tests with it disabled. #317217
- if tc_version_is_at_least 4 || [[ -n ${GCC_CHECKS_LIST} ]] ; then
- confgcc="${confgcc} --enable-checking=${GCC_CHECKS_LIST:-release}"
- else
- confgcc="${confgcc} --disable-checking"
- fi
+ # For newer versions of gcc, use the default ("release"), because no
+ # one (even upstream apparently) tests with it disabled. #317217
+ if tc_version_is_at_least 4 || [[ -n ${GCC_CHECKS_LIST} ]] ; then
+ confgcc="${confgcc} --enable-checking=${GCC_CHECKS_LIST:-release}"
+ else
+ confgcc="${confgcc} --disable-checking"
fi
# GTK+ is preferred over xlib in 3.4.x (xlib is unmaintained
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2010-08-01 3:00 Ryan Hill (dirtyepic)
0 siblings, 0 replies; 266+ messages in thread
From: Ryan Hill (dirtyepic) @ 2010-08-01 3:00 UTC (permalink / raw
To: gentoo-commits
dirtyepic 10/08/01 03:00:36
Modified: toolchain.eclass
Log:
Stop setting STAGE1_CFLAGS in most cases. Fixes bug #283041, bug #326539, and maybe bug #265113.
Revision Changes Path
1.437 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.437&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.437&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.436&r2=1.437
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.436
retrieving revision 1.437
diff -u -r1.436 -r1.437
--- toolchain.eclass 22 Jul 2010 01:26:33 -0000 1.436
+++ toolchain.eclass 1 Aug 2010 03:00:36 -0000 1.437
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.436 2010/07/22 01:26:33 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.437 2010/08/01 03:00:36 dirtyepic Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1488,8 +1488,6 @@
elif [[ $(gcc-version) == "3.4" && ${GCC_BRANCH_VER} == "3.4" ]] && gcc-specs-ssp ; then
# See bug #79852
STAGE1_CFLAGS=${STAGE1_CFLAGS-"-O2"}
- else
- STAGE1_CFLAGS=${STAGE1_CFLAGS-"-O"}
fi
if is_crosscompile; then
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2010-08-14 1:26 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2010-08-14 1:26 UTC (permalink / raw
To: gentoo-commits
vapier 10/08/14 01:26:06
Modified: toolchain.eclass
Log:
mention the gcc-upgrading guide for all versions #328043 by Jacob Godserv
Revision Changes Path
1.438 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.438&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.438&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.437&r2=1.438
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.437
retrieving revision 1.438
diff -u -r1.437 -r1.438
--- toolchain.eclass 1 Aug 2010 03:00:36 -0000 1.437
+++ toolchain.eclass 14 Aug 2010 01:26:05 -0000 1.438
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.437 2010/08/01 03:00:36 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.438 2010/08/14 01:26:05 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -839,6 +839,10 @@
ewarn "If you have issues with packages unable to locate libstdc++.la,"
ewarn "then try running 'fix_libtool_files.sh' on the old gcc versions."
echo
+ ewarn "You might want to review the GCC upgrade guide when moving between"
+ ewarn "major versions (like 4.2 to 4.3):"
+ ewarn "http://www.gentoo.org/doc/en/gcc-upgrading.xml"
+ echo
fi
# If our gcc-config version doesn't like '-' in it's version string,
@@ -856,10 +860,6 @@
ewarn "when moving to gcc-3.4 from gcc-3.3, emerge gentoolkit and run:"
ewarn " # revdep-rebuild --library libstdc++.so.5"
echo
- ewarn "For more information on the steps to take when upgrading "
- ewarn "from gcc-3.3 please refer to: "
- ewarn "http://www.gentoo.org/doc/en/gcc-upgrading.xml"
- echo
fi
if ! is_crosscompile ; then
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2010-09-05 5:52 Ryan Hill (dirtyepic)
0 siblings, 0 replies; 266+ messages in thread
From: Ryan Hill (dirtyepic) @ 2010-09-05 5:52 UTC (permalink / raw
To: gentoo-commits
dirtyepic 10/09/05 05:52:46
Modified: toolchain.eclass
Log:
Use ecj-4.5.jar for >=4.5 (bug #336045).
Revision Changes Path
1.439 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.439&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.439&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.438&r2=1.439
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.438
retrieving revision 1.439
diff -u -r1.438 -r1.439
--- toolchain.eclass 14 Aug 2010 01:26:05 -0000 1.438
+++ toolchain.eclass 5 Sep 2010 05:52:46 -0000 1.439
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.438 2010/08/14 01:26:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.439 2010/09/05 05:52:46 dirtyepic Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -367,9 +367,13 @@
# >= gcc-4.3 uses ecj.jar and we only add gcj as a use flag under certain
# conditions
if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then
- tc_version_is_at_least "4.3" && \
+ if tc_version_is_at_least "4.5" ; then
+ GCC_SRC_URI="${GCC_SRC_URI}
+ gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )"
+ elif tc_version_is_at_least "4.3" ; then
GCC_SRC_URI="${GCC_SRC_URI}
gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )"
+ fi
fi
echo "${GCC_SRC_URI}"
@@ -1057,9 +1061,14 @@
fi
# >= gcc-4.3 doesn't bundle ecj.jar, so copy it
- if [[ ${GCCMAJOR}.${GCCMINOR} > 4.2 ]] &&
- use gcj ; then
- cp -pPR "${DISTDIR}/ecj-4.3.jar" "${S}/ecj.jar" || die
+ if [[ ${GCCMAJOR}.${GCCMINOR} > 4.2 ]] && use gcj ; then
+ if tc_version_is_at_least "4.5" ; then
+ einfo "Copying ecj-4.5.jar"
+ cp -pPR "${DISTDIR}/ecj-4.5.jar" "${S}/ecj.jar" || die
+ elif tc_version_is_at_least "4.3" ; then
+ einfo "Copying ecj-4.3.jar"
+ cp -pPR "${DISTDIR}/ecj-4.3.jar" "${S}/ecj.jar" || die
+ fi
fi
# disable --as-needed from being compiled into gcc specs
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2010-10-10 7:32 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2010-10-10 7:32 UTC (permalink / raw
To: gentoo-commits
vapier 10/10/10 07:32:33
Modified: toolchain.eclass
Log:
make sure toolchain supports pthreads before enabling openmp #326757 #335883
Revision Changes Path
1.440 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.440&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.440&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.439&r2=1.440
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.439
retrieving revision 1.440
diff -u -r1.439 -r1.440
--- toolchain.eclass 5 Sep 2010 05:52:46 -0000 1.439
+++ toolchain.eclass 10 Oct 2010 07:32:33 -0000 1.440
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.439 2010/09/05 05:52:46 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.440 2010/10/10 07:32:33 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1150,7 +1150,15 @@
fi
if tc_version_is_at_least "4.2" ; then
- confgcc="${confgcc} $(use_enable openmp libgomp)"
+ # Make sure target has pthreads support. #326757 #335883
+ # There shouldn't be a chicken&egg problem here as openmp won't
+ # build without a C library, and you can't build that w/out
+ # already having a compiler ...
+ if ! is_crosscompile || \
+ $(tc-getCPP ${CTARGET}) -E - <<<"#include <pthread.h>" >& /dev/null
+ then
+ confgcc="${confgcc} $(use_enable openmp libgomp)"
+ fi
fi
# enable the cld workaround until we move things to stable.
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2010-10-28 4:24 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2010-10-28 4:24 UTC (permalink / raw
To: gentoo-commits
vapier 10/10/28 04:24:13
Modified: toolchain.eclass
Log:
turn large if statement with globs into a case, merge the *-elf logic, and add *-eabi #283545
Revision Changes Path
1.441 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.441&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.441&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.440&r2=1.441
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.440
retrieving revision 1.441
diff -u -r1.440 -r1.441
--- toolchain.eclass 10 Oct 2010 07:32:33 -0000 1.440
+++ toolchain.eclass 28 Oct 2010 04:24:13 -0000 1.441
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.440 2010/10/10 07:32:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.441 2010/10/28 04:24:13 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1362,7 +1362,7 @@
case ${CTARGET} in
*-linux) needed_libc=no-fucking-clue;;
*-dietlibc) needed_libc=dietlibc;;
- *-elf) needed_libc=newlib;;
+ *-elf|*-eabi) needed_libc=newlib;;
*-freebsd*) needed_libc=freebsd-lib;;
*-gnu*) needed_libc=glibc;;
*-klibc) needed_libc=klibc;;
@@ -1399,23 +1399,30 @@
confgcc="${confgcc} --enable-threads=posix" ;;
esac
fi
- [[ ${CTARGET} == *-elf ]] && confgcc="${confgcc} --with-newlib"
# __cxa_atexit is "essential for fully standards-compliant handling of
# destructors", but apparently requires glibc.
- if [[ ${CTARGET} == *-uclibc* ]] ; then
+ case ${CTARGET} in
+ *-uclibc*)
confgcc="${confgcc} --disable-__cxa_atexit --enable-target-optspace $(use_enable nptl tls)"
[[ ${GCCMAJOR}.${GCCMINOR} == 3.3 ]] && confgcc="${confgcc} --enable-sjlj-exceptions"
if tc_version_is_at_least 3.4 && [[ ${GCCMAJOR}.${GCCMINOR} < 4.3 ]] ; then
confgcc="${confgcc} --enable-clocale=uclibc"
fi
- elif [[ ${CTARGET} == *-gnu* ]] ; then
+ ;;
+ *-elf|*-eabi)
+ confgcc="${confgcc} --with-newlib"
+ ;;
+ *-gnu*)
confgcc="${confgcc} --enable-__cxa_atexit"
confgcc="${confgcc} --enable-clocale=gnu"
- elif [[ ${CTARGET} == *-freebsd* ]]; then
+ ;;
+ *-freebsd*)
confgcc="${confgcc} --enable-__cxa_atexit"
- elif [[ ${CTARGET} == *-solaris* ]]; then
+ ;;
+ *-solaris*)
confgcc="${confgcc} --enable-__cxa_atexit"
- fi
+ ;;
+ esac
[[ ${GCCMAJOR}.${GCCMINOR} < 3.4 ]] && confgcc="${confgcc} --disable-libunwind-exceptions"
# create a sparc*linux*-{gcc,g++} that can handle -m32 and -m64 (biarch)
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2010-11-21 21:25 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2010-11-21 21:25 UTC (permalink / raw
To: gentoo-commits
vapier 10/11/21 21:25:24
Modified: toolchain.eclass
Log:
make sure to explicitly pass --disable-libgomp when using a package that lacks openmp support (like kgcc64) #341771 by Alex Buell
Revision Changes Path
1.442 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.442&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.442&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.441&r2=1.442
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.441
retrieving revision 1.442
diff -u -r1.441 -r1.442
--- toolchain.eclass 28 Oct 2010 04:24:13 -0000 1.441
+++ toolchain.eclass 21 Nov 2010 21:25:24 -0000 1.442
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.441 2010/10/28 04:24:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.442 2010/11/21 21:25:24 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1150,14 +1150,18 @@
fi
if tc_version_is_at_least "4.2" ; then
- # Make sure target has pthreads support. #326757 #335883
- # There shouldn't be a chicken&egg problem here as openmp won't
- # build without a C library, and you can't build that w/out
- # already having a compiler ...
- if ! is_crosscompile || \
- $(tc-getCPP ${CTARGET}) -E - <<<"#include <pthread.h>" >& /dev/null
- then
- confgcc="${confgcc} $(use_enable openmp libgomp)"
+ if has openmp ${IUSE} ; then
+ # Make sure target has pthreads support. #326757 #335883
+ # There shouldn't be a chicken&egg problem here as openmp won't
+ # build without a C library, and you can't build that w/out
+ # already having a compiler ...
+ if ! is_crosscompile || \
+ $(tc-getCPP ${CTARGET}) -E - <<<"#include <pthread.h>" >& /dev/null
+ then
+ confgcc="${confgcc} $(use_enable openmp libgomp)"
+ fi
+ else
+ confgcc="${confgcc} --disable-libgomp"
fi
fi
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2010-11-21 21:26 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2010-11-21 21:26 UTC (permalink / raw
To: gentoo-commits
vapier 10/11/21 21:26:22
Modified: toolchain.eclass
Log:
convert IUSE appending to the += operator, and pull out IUSE=vanilla for all gcc packages
Revision Changes Path
1.443 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.443&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.443&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.442&r2=1.443
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.442
retrieving revision 1.443
diff -u -r1.442 -r1.443
--- toolchain.eclass 21 Nov 2010 21:25:24 -0000 1.442
+++ toolchain.eclass 21 Nov 2010 21:26:22 -0000 1.443
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.442 2010/11/21 21:25:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.443 2010/11/21 21:26:22 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -139,31 +139,35 @@
else
IUSE="multislot nptl test"
+ if tc_version_is_at_least 3 ; then
+ IUSE+=" vanilla"
+ fi
+
if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then
- IUSE="${IUSE} altivec build fortran nls nocxx"
- [[ -n ${PIE_VER} ]] && IUSE="${IUSE} nopie"
- [[ -n ${PP_VER} ]] && IUSE="${IUSE} nossp"
- [[ -n ${SPECS_VER} ]] && IUSE="${IUSE} nossp"
- [[ -n ${HTB_VER} ]] && IUSE="${IUSE} boundschecking"
- [[ -n ${D_VER} ]] && IUSE="${IUSE} d"
+ IUSE+=" altivec build fortran nls nocxx"
+ [[ -n ${PIE_VER} ]] && IUSE+=" nopie"
+ [[ -n ${PP_VER} ]] && IUSE+=" nossp"
+ [[ -n ${SPECS_VER} ]] && IUSE+=" nossp"
+ [[ -n ${HTB_VER} ]] && IUSE+=" boundschecking"
+ [[ -n ${D_VER} ]] && IUSE+=" d"
if tc_version_is_at_least 3 ; then
- IUSE="${IUSE} bootstrap doc gcj gtk hardened libffi multilib objc vanilla"
+ IUSE+=" bootstrap doc gcj gtk hardened libffi multilib objc"
# gcc-{nios2,bfin} don't accept these
if [[ ${PN} == "gcc" ]] ; then
- IUSE="${IUSE} n32 n64"
+ IUSE+=" n32 n64"
fi
- tc_version_is_at_least "4.0" && IUSE="${IUSE} objc-gc mudflap"
- tc_version_is_at_least "4.1" && IUSE="${IUSE} objc++"
- tc_version_is_at_least "4.2" && IUSE="${IUSE} openmp"
- tc_version_is_at_least "4.3" && IUSE="${IUSE} fixed-point"
+ tc_version_is_at_least "4.0" && IUSE+=" objc-gc mudflap"
+ tc_version_is_at_least "4.1" && IUSE+=" objc++"
+ tc_version_is_at_least "4.2" && IUSE+=" openmp"
+ tc_version_is_at_least "4.3" && IUSE+=" fixed-point"
if tc_version_is_at_least "4.4" ; then
- IUSE="${IUSE} graphite"
- [[ -n ${SPECS_VER} ]] && IUSE="${IUSE} nossp"
+ IUSE+=" graphite"
+ [[ -n ${SPECS_VER} ]] && IUSE+=" nossp"
fi
- tc_version_is_at_least "4.5" && IUSE="${IUSE} lto"
+ tc_version_is_at_least "4.5" && IUSE+=" lto"
fi
fi
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2010-12-29 7:31 Ryan Hill (dirtyepic)
0 siblings, 0 replies; 266+ messages in thread
From: Ryan Hill (dirtyepic) @ 2010-12-29 7:31 UTC (permalink / raw
To: gentoo-commits
dirtyepic 10/12/29 07:31:43
Modified: toolchain.eclass
Log:
Disable PPL version checking to prevent bailing out with ppl-0.11.
Revision Changes Path
1.444 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.444&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.444&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.443&r2=1.444
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.443
retrieving revision 1.444
diff -u -r1.443 -r1.444
--- toolchain.eclass 21 Nov 2010 21:26:22 -0000 1.443
+++ toolchain.eclass 29 Dec 2010 07:31:43 -0000 1.444
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.443 2010/11/21 21:26:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.444 2010/12/29 07:31:43 dirtyepic Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1328,9 +1328,12 @@
# graphite support was added in 4.4, which depends upon external libraries
# for optimizations. This option allows users to determine if they want
- # these optimizations and libraries pulled in
+ # these optimizations and libraries pulled in. We disable the version check
+ # so we can use >=ppl-0.11
tc_version_is_at_least "4.4" && \
- confgcc="${confgcc} $(use_with graphite ppl) $(use_with graphite cloog)"
+ confgcc="${confgcc} $(use_with graphite ppl)
+ $(use_with graphite cloog)
+ --disable-ppl-version-check"
# lto support was added in 4.5, which depends upon elfutils. This allows
# users to enable that option, and pull in the additional library
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-01-06 23:22 Ryan Hill (dirtyepic)
0 siblings, 0 replies; 266+ messages in thread
From: Ryan Hill (dirtyepic) @ 2011-01-06 23:22 UTC (permalink / raw
To: gentoo-commits
dirtyepic 11/01/06 23:22:37
Modified: toolchain.eclass
Log:
Fix cloog-ppl include paths for upcoming 0.15.10 and clean up graphite and LTO handing for 4.6.
Revision Changes Path
1.445 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.445&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.445&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.444&r2=1.445
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.444
retrieving revision 1.445
diff -u -r1.444 -r1.445
--- toolchain.eclass 29 Dec 2010 07:31:43 -0000 1.444
+++ toolchain.eclass 6 Jan 2011 23:22:37 -0000 1.445
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.444 2010/12/29 07:31:43 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.445 2011/01/06 23:22:37 dirtyepic Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -167,7 +167,7 @@
IUSE+=" graphite"
[[ -n ${SPECS_VER} ]] && IUSE+=" nossp"
fi
- tc_version_is_at_least "4.5" && IUSE+=" lto"
+ [[ ${GCC_BRANCH_VER} == 4.5 ]] && IUSE+=" lto"
fi
fi
@@ -1326,20 +1326,29 @@
# users to control this feature in the event they need the support.
tc_version_is_at_least "4.3" && confgcc="${confgcc} $(use_enable fixed-point)"
- # graphite support was added in 4.4, which depends upon external libraries
- # for optimizations. This option allows users to determine if they want
- # these optimizations and libraries pulled in. We disable the version check
- # so we can use >=ppl-0.11
- tc_version_is_at_least "4.4" && \
- confgcc="${confgcc} $(use_with graphite ppl)
- $(use_with graphite cloog)
- --disable-ppl-version-check"
-
- # lto support was added in 4.5, which depends upon elfutils. This allows
- # users to enable that option, and pull in the additional library
- tc_version_is_at_least "4.5" && \
- confgcc="${confgcc} $(use_enable lto)"
+ # Graphite support was added in 4.4, which depends on external libraries
+ # for optimizations. Up to 4.6 we use cloog-ppl (cloog fork with Parma PPL
+ # backend). Later versions will use upstream cloog with the ISL backend. We
+ # disable the PPL version check so we can use >=ppl-0.11.
+ if tc_version_is_at_least "4.4"; then
+ confgcc="${confgcc} $(use_with graphite ppl)"
+ confgcc="${confgcc} $(use_with graphite cloog)"
+ if use graphite; then
+ confgcc="${confgcc} --disable-ppl-version-check"
+ # this will be removed when cloog-ppl-0.15.10 goes stable
+ if has_version '>=dev-libs/cloog-ppl-0.15.10'; then
+ confgcc="${confgcc} --with-cloog-include=/usr/include/cloog-ppl"
+ else
+ confgcc="${confgcc} --with-cloog-include=/usr/include/cloog"
+ fi
+ fi
+ fi
+ # LTO support was added in 4.5, which depends upon elfutils. This allows
+ # users to enable that option, and pull in the additional library. In 4.6,
+ # the dependency is no longer required.
+ [[ ${GCC_BRANCH_VER} == 4.5 ]] && confgcc="${confgcc} $(use_enable lto)"
+ [[ ${GCC_BRANCH_VER} > 4.5 ]] && confgcc="${confgcc} --enable-lto"
[[ $(tc-is-softfloat) == "yes" ]] && confgcc="${confgcc} --with-float=soft"
[[ $(tc-is-hardfloat) == "yes" ]] && confgcc="${confgcc} --with-float=hard"
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-01-08 7:44 Ryan Hill (dirtyepic)
0 siblings, 0 replies; 266+ messages in thread
From: Ryan Hill (dirtyepic) @ 2011-01-08 7:44 UTC (permalink / raw
To: gentoo-commits
dirtyepic 11/01/08 07:44:13
Modified: toolchain.eclass
Log:
Use $(get_libdir) when installing to rcscripts. (bug #262845)
Revision Changes Path
1.446 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.446&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.446&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.445&r2=1.446
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.445
retrieving revision 1.446
diff -u -r1.445 -r1.446
--- toolchain.eclass 6 Jan 2011 23:22:37 -0000 1.445
+++ toolchain.eclass 8 Jan 2011 07:44:13 -0000 1.446
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.445 2011/01/06 23:22:37 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.446 2011/01/08 07:44:13 dirtyepic Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -872,11 +872,11 @@
if ! is_crosscompile ; then
# hack to prevent collisions between SLOT
- [[ ! -d ${ROOT}/lib/rcscripts/awk ]] \
- && mkdir -p "${ROOT}"/lib/rcscripts/awk
+ [[ ! -d ${ROOT}/$(get_libdir)/rcscripts/awk ]] \
+ && mkdir -p "${ROOT}"/$(get_libdir)/rcscripts/awk
[[ ! -d ${ROOT}/sbin ]] \
&& mkdir -p "${ROOT}"/sbin
- cp "${ROOT}/${DATAPATH}"/fixlafiles.awk "${ROOT}"/lib/rcscripts/awk/ || die "installing fixlafiles.awk"
+ cp "${ROOT}/${DATAPATH}"/fixlafiles.awk "${ROOT}"/$(get_libdir)/rcscripts/awk/ || die "installing fixlafiles.awk"
cp "${ROOT}/${DATAPATH}"/fix_libtool_files.sh "${ROOT}"/sbin/ || die "installing fix_libtool_files.sh"
[[ ! -d ${ROOT}/usr/bin ]] \
@@ -894,7 +894,7 @@
gcc-compiler_pkg_prerm() {
# Don't let these files be uninstalled #87647
touch -c "${ROOT}"/sbin/fix_libtool_files.sh \
- "${ROOT}"/lib/rcscripts/awk/fixlafiles.awk
+ "${ROOT}"/$(get_libdir)/rcscripts/awk/fixlafiles.awk
}
gcc-compiler_pkg_postrm() {
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-01-11 18:53 Fabian Groffen (grobian)
0 siblings, 0 replies; 266+ messages in thread
From: Fabian Groffen (grobian) @ 2011-01-11 18:53 UTC (permalink / raw
To: gentoo-commits
grobian 11/01/11 18:53:32
Modified: toolchain.eclass
Log:
FreeMiNT can do threads now, bug #350822
Revision Changes Path
1.447 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.447&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.447&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.446&r2=1.447
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.446
retrieving revision 1.447
diff -u -r1.446 -r1.447
--- toolchain.eclass 8 Jan 2011 07:44:13 -0000 1.446
+++ toolchain.eclass 11 Jan 2011 18:53:32 -0000 1.447
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.446 2011/01/08 07:44:13 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.447 2011/01/11 18:53:32 grobian Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1413,8 +1413,6 @@
case ${CHOST} in
mingw*|*-mingw*|*-cygwin)
confgcc="${confgcc} --enable-threads=win32" ;;
- *-mint*)
- confgcc="${confgcc} --disable-threads" ;;
*)
confgcc="${confgcc} --enable-threads=posix" ;;
esac
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-01-18 1:42 Ryan Hill (dirtyepic)
0 siblings, 0 replies; 266+ messages in thread
From: Ryan Hill (dirtyepic) @ 2011-01-18 1:42 UTC (permalink / raw
To: gentoo-commits
dirtyepic 11/01/18 01:42:19
Modified: toolchain.eclass
Log:
Compare with version triplet rather than full version so we can match snapshots.
Revision Changes Path
1.448 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.448&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.448&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.447&r2=1.448
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.447
retrieving revision 1.448
diff -u -r1.447 -r1.448
--- toolchain.eclass 11 Jan 2011 18:53:32 -0000 1.447
+++ toolchain.eclass 18 Jan 2011 01:42:19 -0000 1.448
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.447 2011/01/11 18:53:32 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.448 2011/01/18 01:42:19 dirtyepic Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -57,7 +57,7 @@
[[ ${CHOST} != ${CTARGET} ]]
}
-tc_version_is_at_least() { version_is_at_least "$1" "${2:-${GCC_PV}}" ; }
+tc_version_is_at_least() { version_is_at_least "$1" "${2:-${GCC_RELEASE_VER}}" ; }
GCC_PV=${TOOLCHAIN_GCC_PV:-${PV}}
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-01-18 7:00 Ryan Hill (dirtyepic)
0 siblings, 0 replies; 266+ messages in thread
From: Ryan Hill (dirtyepic) @ 2011-01-18 7:00 UTC (permalink / raw
To: gentoo-commits
dirtyepic 11/01/18 07:00:50
Modified: toolchain.eclass
Log:
Add support for Go language in 4.6. (bug #329551)
Revision Changes Path
1.449 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.449&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.449&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.448&r2=1.449
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.448
retrieving revision 1.449
diff -u -r1.448 -r1.449
--- toolchain.eclass 18 Jan 2011 01:42:19 -0000 1.448
+++ toolchain.eclass 18 Jan 2011 07:00:50 -0000 1.449
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.448 2011/01/18 01:42:19 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.449 2011/01/18 07:00:50 dirtyepic Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -168,6 +168,7 @@
[[ -n ${SPECS_VER} ]] && IUSE+=" nossp"
fi
[[ ${GCC_BRANCH_VER} == 4.5 ]] && IUSE+=" lto"
+ tc_version_is_at_least "4.6" && IUSE+=" go"
fi
fi
@@ -826,6 +827,12 @@
# we dont want to use the installed compiler's specs to build gcc!
unset GCC_SPECS
+
+ if use nocxx ; then
+ use go && ewarn 'Go requires a C++ compiler, disabled due to USE="nocxx"'
+ use objc++ && ewarn 'Obj-C++ requires a C++ compiler, disabled due to USE="nocxx"'
+ use gcj && ewarn 'GCJ requires a C++ compiler, disabled due to USE="nocxx"'
+ fi
fi
want_libssp && libc_has_ssp && \
@@ -1251,6 +1258,7 @@
is_cxx && GCC_LANG="${GCC_LANG},c++"
is_d && GCC_LANG="${GCC_LANG},d"
is_gcj && GCC_LANG="${GCC_LANG},java"
+ is_go && GCC_LANG="${GCC_LANG},go"
if is_objc || is_objcxx ; then
GCC_LANG="${GCC_LANG},objc"
if tc_version_is_at_least "4.0" ; then
@@ -1829,7 +1837,7 @@
# These should be symlinks
dodir /usr/bin
cd "${D}"${BINPATH}
- for x in cpp gcc g++ c++ g77 gcj gcjh gfortran ; do
+ for x in cpp gcc g++ c++ g77 gcj gcjh gfortran gccgo ; do
# For some reason, g77 gets made instead of ${CTARGET}-g77...
# this should take care of that
[[ -f ${x} ]] && mv ${x} ${CTARGET}-${x}
@@ -1926,6 +1934,10 @@
doins "${module}"
rm "${module}"
done
+
+ # Don't scan .gox files for executable stacks - false positives
+ export QA_EXECSTACK="usr/lib*/go/*/*.gox"
+ export QA_WX_LOAD="usr/lib*/go/*/*.gox"
}
gcc_slot_java() {
@@ -2480,7 +2492,12 @@
is_gcj() {
gcc-lang-supported java || return 1
- use gcj
+ ! use nocxx && use gcj
+}
+
+is_go() {
+ gcc-lang-supported go || return 1
+ ! use nocxx && use go
}
is_libffi() {
@@ -2495,7 +2512,7 @@
is_objcxx() {
gcc-lang-supported 'obj-c++' || return 1
- use objc++
+ ! use nocxx && use objc++
}
is_ada() {
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-02-13 12:10 Ryan Hill (dirtyepic)
0 siblings, 0 replies; 266+ messages in thread
From: Ryan Hill (dirtyepic) @ 2011-02-13 12:10 UTC (permalink / raw
To: gentoo-commits
dirtyepic 11/02/13 12:10:12
Modified: toolchain.eclass
Log:
Rewrite gdb module installation and make it actually work. (bug #348128).
Revision Changes Path
1.450 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.450&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.450&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.449&r2=1.450
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.449
retrieving revision 1.450
diff -u -r1.449 -r1.450
--- toolchain.eclass 18 Jan 2011 07:00:50 -0000 1.449
+++ toolchain.eclass 13 Feb 2011 12:10:12 -0000 1.450
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.449 2011/01/18 07:00:50 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.450 2011/02/13 12:10:12 dirtyepic Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1927,12 +1927,15 @@
chown -R root:0 "${D}"${LIBPATH}
# Move pretty-printers to gdb datadir to shut ldconfig up
- gdbdir=/usr/share/gdb/auto-load
- for module in $(find "${D}" -iname "*-gdb.py" -print); do
- insinto ${gdbdir}/$(dirname "${module/${D}/}" | \
- sed -e "s:/lib/:/$(get_libdir)/:g")
- doins "${module}"
- rm "${module}"
+ gdbdir=/usr/share/gdb/auto-load${LIBPATH/\/lib\//\/$(get_libdir)\/}
+ for i in "${D}"${LIBPATH}{,/32}/*-gdb.py; do
+ if [[ -e ${i} ]]; then
+ basedir="$(dirname ${i/${D}${LIBPATH}/})"
+ sed -i -e "s:^\(libdir = \).*:\1'${LIBPATH}${basedir}':" "${i}" #348128
+ insinto "${gdbdir}${basedir}"
+ doins "${i}"
+ rm "${i}"
+ fi
done
# Don't scan .gox files for executable stacks - false positives
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-03-01 0:13 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-03-01 0:13 UTC (permalink / raw
To: gentoo-commits
vapier 11/03/01 00:13:02
Modified: toolchain.eclass
Log:
auto enable e500-double for ppc targets when possible #353380 by Alexander Dubov
Revision Changes Path
1.451 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.451&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.451&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.450&r2=1.451
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.450
retrieving revision 1.451
diff -u -r1.450 -r1.451
--- toolchain.eclass 13 Feb 2011 12:10:12 -0000 1.450
+++ toolchain.eclass 1 Mar 2011 00:13:01 -0000 1.451
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.450 2011/02/13 12:10:12 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.451 2011/03/01 00:13:01 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1252,6 +1252,11 @@
hppa)
[[ ${GCCMAJOR} == "3" ]] && confgcc="${confgcc} --enable-sjlj-exceptions"
;;
+ # Set up defaults based on current CFLAGS
+ ppc)
+ is-flagq -mfloat-gprs=double && confgcc+=" --enable-e500-double"
+ [[ ${CTARGET//_/-} == *-e500v2-* ]] && confgcc+=" --enable-e500-double"
+ ;;
esac
GCC_LANG="c"
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-03-11 15:32 Fabian Groffen (grobian)
0 siblings, 0 replies; 266+ messages in thread
From: Fabian Groffen (grobian) @ 2011-03-11 15:32 UTC (permalink / raw
To: gentoo-commits
grobian 11/03/11 15:32:25
Modified: toolchain.eclass
Log:
use CTARGET iso CHOST, as pointed out by SpanKY
Revision Changes Path
1.452 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.452&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.452&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.451&r2=1.452
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.451
retrieving revision 1.452
diff -u -r1.451 -r1.452
--- toolchain.eclass 1 Mar 2011 00:13:01 -0000 1.451
+++ toolchain.eclass 11 Mar 2011 15:32:25 -0000 1.452
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.451 2011/03/01 00:13:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.452 2011/03/11 15:32:25 grobian Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1317,7 +1317,7 @@
# for things like libobjc-gnu, libgcj and libfortran. If we enable it on
# non-Darwin we screw up the behaviour this eclass relies on. We in
# particular need this over --libdir for bug #255315.
- [[ ${CHOST} == *-darwin* ]] && \
+ [[ ${CTARGET} == *-darwin* ]] && \
confgcc="${confgcc} --enable-version-specific-runtime-libs"
# All our cross-compile logic goes here ! woo !
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-03-18 20:28 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-03-18 20:28 UTC (permalink / raw
To: gentoo-commits
vapier 11/03/18 20:28:32
Modified: toolchain.eclass
Log:
only use multilib hack when SYMLINK_LIB is in use
Revision Changes Path
1.453 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.453&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.453&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.452&r2=1.453
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.452
retrieving revision 1.453
diff -u -r1.452 -r1.453
--- toolchain.eclass 11 Mar 2011 15:32:25 -0000 1.452
+++ toolchain.eclass 18 Mar 2011 20:28:32 -0000 1.453
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.452 2011/03/11 15:32:25 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.453 2011/03/18 20:28:32 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1059,7 +1059,7 @@
done
ht_fix_file ${fix_files} */configure *.sh */Makefile.in
- if ! is_crosscompile && is_multilib && \
+ if ! is_crosscompile && is_multilib && [[ ${SYMLINK_LIB} == "yes" ]] && \
[[ ( $(tc-arch) == "amd64" || $(tc-arch) == "ppc64" ) && -z ${SKIP_MULTILIB_HACK} ]] ; then
disgusting_gcc_multilib_HACK || die "multilib hack failed"
fi
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-03-24 8:30 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-03-24 8:30 UTC (permalink / raw
To: gentoo-commits
vapier 11/03/24 08:30:19
Modified: toolchain.eclass
Log:
disable libgomp for cross-compilers that cant support it #359855 by Andrei Slavoiu
Revision Changes Path
1.454 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.454&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.454&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.453&r2=1.454
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.453
retrieving revision 1.454
diff -u -r1.453 -r1.454
--- toolchain.eclass 18 Mar 2011 20:28:32 -0000 1.453
+++ toolchain.eclass 24 Mar 2011 08:30:19 -0000 1.454
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.453 2011/03/18 20:28:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.454 2011/03/24 08:30:19 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1170,8 +1170,12 @@
$(tc-getCPP ${CTARGET}) -E - <<<"#include <pthread.h>" >& /dev/null
then
confgcc="${confgcc} $(use_enable openmp libgomp)"
+ else
+ # Force disable as the configure script can be dumb #359855
+ confgcc="${confgcc} --disable-libgomp"
fi
else
+ # For gcc variants where we don't want openmp (e.g. kgcc)
confgcc="${confgcc} --disable-libgomp"
fi
fi
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-03-24 8:34 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-03-24 8:34 UTC (permalink / raw
To: gentoo-commits
vapier 11/03/24 08:34:17
Modified: toolchain.eclass
Log:
disable posix heads/tails fixing for newer gcc versions
Revision Changes Path
1.455 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.455&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.455&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.454&r2=1.455
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.454
retrieving revision 1.455
diff -u -r1.454 -r1.455
--- toolchain.eclass 24 Mar 2011 08:30:19 -0000 1.454
+++ toolchain.eclass 24 Mar 2011 08:34:17 -0000 1.455
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.454 2011/03/24 08:30:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.455 2011/03/24 08:34:17 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1053,11 +1053,14 @@
fi
fi
- fix_files=""
- for x in contrib/test_summary libstdc++-v3/scripts/check_survey.in ; do
- [[ -e ${x} ]] && fix_files="${fix_files} ${x}"
- done
- ht_fix_file ${fix_files} */configure *.sh */Makefile.in
+ # No idea when this first started being fixed, but let's go with 4.3.x for now
+ if ! tc_version_is_at_least 4.3 ; then
+ fix_files=""
+ for x in contrib/test_summary libstdc++-v3/scripts/check_survey.in ; do
+ [[ -e ${x} ]] && fix_files="${fix_files} ${x}"
+ done
+ ht_fix_file ${fix_files} */configure *.sh */Makefile.in
+ fi
if ! is_crosscompile && is_multilib && [[ ${SYMLINK_LIB} == "yes" ]] && \
[[ ( $(tc-arch) == "amd64" || $(tc-arch) == "ppc64" ) && -z ${SKIP_MULTILIB_HACK} ]] ; then
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-03-24 8:37 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-03-24 8:37 UTC (permalink / raw
To: gentoo-commits
vapier 11/03/24 08:37:28
Modified: toolchain.eclass
Log:
rewrite/cleanup the MULTILIB_OSDIRNAMES update logic since it seems we will be stuck with it forever for different reasons
Revision Changes Path
1.456 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.456&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.456&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.455&r2=1.456
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.455
retrieving revision 1.456
diff -u -r1.455 -r1.456
--- toolchain.eclass 24 Mar 2011 08:34:17 -0000 1.455
+++ toolchain.eclass 24 Mar 2011 08:37:28 -0000 1.456
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.455 2011/03/24 08:34:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.456 2011/03/24 08:37:28 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1062,10 +1062,7 @@
ht_fix_file ${fix_files} */configure *.sh */Makefile.in
fi
- if ! is_crosscompile && is_multilib && [[ ${SYMLINK_LIB} == "yes" ]] && \
- [[ ( $(tc-arch) == "amd64" || $(tc-arch) == "ppc64" ) && -z ${SKIP_MULTILIB_HACK} ]] ; then
- disgusting_gcc_multilib_HACK || die "multilib hack failed"
- fi
+ setup_multilib_osdirnames
gcc_version_patch
if [[ ${GCCMAJOR}.${GCCMINOR} > 4.0 ]] ; then
@@ -2402,34 +2399,44 @@
"${S}"/gcc/version.c || die "Failed to change the bug URL"
}
-# The purpose of this DISGUSTING gcc multilib hack is to allow 64bit libs
-# to live in lib instead of lib64 where they belong, with 32bit libraries
-# in lib32. This hack has been around since the beginning of the amd64 port,
-# and we're only now starting to fix everything that's broken. Eventually
-# this should go away.
-#
-# Travis Tilley <lv@gentoo.org> (03 Sep 2004)
-#
-disgusting_gcc_multilib_HACK() {
+# This is a historical wart. The original Gentoo/amd64 port used:
+# lib32 - 32bit binaries (x86)
+# lib64 - 64bit binaries (x86_64)
+# lib - "native" binaries (a symlink to lib64)
+# Most other distros use the logic (including mainline gcc):
+# lib - 32bit binaries (x86)
+# lib64 - 64bit binaries (x86_64)
+# Over time, Gentoo is migrating to the latter form.
+#
+# Unfortunately, due to distros picking the lib32 behavior, newer gcc
+# versions will dynamically detect whether to use lib or lib32 for its
+# 32bit multilib. So, to keep the automagic from getting things wrong
+# while people are transitioning from the old style to the new style,
+# we always set the MULTILIB_OSDIRNAMES var for relevant targets.
+setup_multilib_osdirnames() {
+ is_multilib || return 0
+
local config
local libdirs
- if has_multilib_profile ; then
- case $(tc-arch) in
- amd64)
- config="i386/t-linux64"
- libdirs="../$(get_abi_LIBDIR amd64) ../$(get_abi_LIBDIR x86)" \
- ;;
- ppc64)
- config="rs6000/t-linux64"
- libdirs="../$(get_abi_LIBDIR ppc64) ../$(get_abi_LIBDIR ppc)" \
- ;;
- esac
+
+ if [[ ${SYMLINK_LIB} == "yes" ]] ; then
+ libdirs="../lib64 ../lib32"
else
- die "Your profile is no longer supported by portage."
+ libdirs="../lib64 ../lib"
fi
+ # this only makes sense for some Linux targets
+ case ${CTARGET} in
+ x86_64*-linux*) config="i386" ;;
+ powerpc64*-linux*) config="rs6000" ;;
+ sparc64*-linux*) config="sparc" ;;
+ s390x*-linux*) config="s390" ;;
+ *) return 0 ;;
+ esac
+ config+="/t-linux64"
+
einfo "updating multilib directories to be: ${libdirs}"
- sed -i -e "s:^MULTILIB_OSDIRNAMES.*:MULTILIB_OSDIRNAMES = ${libdirs}:" "${S}"/gcc/config/${config}
+ sed -i -e "/^MULTILIB_OSDIRNAMES/s:=.*:= ${libdirs}:" "${S}"/gcc/config/${config} || die
}
disable_multilib_libjava() {
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-04-10 16:54 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-04-10 16:54 UTC (permalink / raw
To: gentoo-commits
vapier 11/04/10 16:54:17
Modified: toolchain.eclass
Log:
drop old sandbox multilib check as this isnt how sandbox sets LD_PRELOAD anymore, and it has dubious value in the first place in a cross-compiling world
Revision Changes Path
1.457 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.457&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.457&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.456&r2=1.457
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.456
retrieving revision 1.457
diff -u -r1.456 -r1.457
--- toolchain.eclass 24 Mar 2011 08:37:28 -0000 1.456
+++ toolchain.eclass 10 Apr 2011 16:54:17 -0000 1.457
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.456 2011/03/24 08:37:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.457 2011/04/10 16:54:17 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -788,13 +788,6 @@
gcc_pkg_setup() {
[[ -z ${ETYPE} ]] && die "Your ebuild needs to set the ETYPE variable"
- if [[ ( $(tc-arch) == "amd64" || $(tc-arch) == "ppc64" ) && ( ${LD_PRELOAD} == "/lib/libsandbox.so" || ${LD_PRELOAD} == "/usr/lib/libsandbox.so" ) ]] && is_multilib ; then
- eerror "Sandbox in your installed portage does not support compilation."
- eerror "of a multilib gcc. Please set FEATURES=-sandbox and try again."
- eerror "After you have a multilib gcc, re-emerge portage to have a working sandbox."
- die "No 32bit sandbox. Retry with FEATURES=-sandbox."
- fi
-
if [[ ${ETYPE} == "gcc-compiler" ]] ; then
case $(tc-arch) in
mips)
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-04-10 18:21 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-04-10 18:21 UTC (permalink / raw
To: gentoo-commits
vapier 11/04/10 18:21:20
Modified: toolchain.eclass
Log:
drop unused GCC_TARGET_NO_MULTILIB logic, and keep all multilib logic flowing via is_multilib. change this latter function to only run on top of USE=multilib rather than tracking random CTARGETS as this is much more friendly to cross-compiling (especially now that crossdev takes care of multilib setup for toolchains).
Revision Changes Path
1.458 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.458&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.458&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.457&r2=1.458
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.457
retrieving revision 1.458
diff -u -r1.457 -r1.458
--- toolchain.eclass 10 Apr 2011 16:54:17 -0000 1.457
+++ toolchain.eclass 10 Apr 2011 18:21:20 -0000 1.458
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.457 2011/04/10 16:54:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.458 2011/04/10 18:21:20 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -91,11 +91,9 @@
if [[ ${ETYPE} == "gcc-library" ]] ; then
GCC_VAR_TYPE=${GCC_VAR_TYPE:-non-versioned}
GCC_LIB_COMPAT_ONLY=${GCC_LIB_COMPAT_ONLY:-true}
- GCC_TARGET_NO_MULTILIB=${GCC_TARGET_NO_MULTILIB:-true}
else
GCC_VAR_TYPE=${GCC_VAR_TYPE:-versioned}
GCC_LIB_COMPAT_ONLY="false"
- GCC_TARGET_NO_MULTILIB=${GCC_TARGET_NO_MULTILIB:-false}
fi
PREFIX=${TOOLCHAIN_PREFIX:-/usr}
@@ -699,7 +697,7 @@
echo "ROOTPATH=\"${BINPATH}\"" >> ${gcc_envd_file}
echo "GCC_PATH=\"${BINPATH}\"" >> ${gcc_envd_file}
- if use multilib && ! has_multilib_profile; then
+ if is_multilib ; then
LDPATH="${LIBPATH}"
for path in 32 64 ; do
[[ -d ${LIBPATH}/${path} ]] && LDPATH="${LDPATH}:${LIBPATH}/${path}"
@@ -813,7 +811,7 @@
# Setup variables which would normally be in the profile
if is_crosscompile ; then
multilib_env ${CTARGET}
- if ! use multilib ; then
+ if ! is_multilib ; then
MULTILIB_ABIS=${DEFAULT_ABI}
fi
fi
@@ -1120,17 +1118,17 @@
}
gcc-library-configure() {
- # multilib support
- [[ ${GCC_TARGET_NO_MULTILIB} == "true" ]] \
- && confgcc="${confgcc} --disable-multilib" \
- || confgcc="${confgcc} --enable-multilib"
+ if is_multilib ; then
+ confgcc="${confgcc} --enable-multilib"
+ else
+ confgcc="${confgcc} --disable-multilib"
+ fi
}
gcc-compiler-configure() {
- # multilib support
if is_multilib ; then
confgcc="${confgcc} --enable-multilib"
- elif [[ ${CTARGET} == *-linux* ]] ; then
+ else
confgcc="${confgcc} --disable-multilib"
fi
@@ -1290,9 +1288,6 @@
# CBUILD
# Enable building for a target that differs from CHOST
#
-# GCC_TARGET_NO_MULTILIB
-# Disable multilib. Useful when building single library targets.
-#
# GCC_LANG
# Enable support for ${GCC_LANG} languages. defaults to just "c"
#
@@ -2471,13 +2466,7 @@
is_multilib() {
[[ ${GCCMAJOR} < 3 ]] && return 1
- case ${CTARGET} in
- mips64*|powerpc64*|s390x*|sparc*|x86_64*)
- has_multilib_profile || use multilib ;;
- *-*-solaris*|*-apple-darwin*|*-mint*)
- use multilib ;;
- *) false ;;
- esac
+ use multilib
}
is_cxx() {
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-04-11 23:11 Ryan Hill (dirtyepic)
0 siblings, 0 replies; 266+ messages in thread
From: Ryan Hill (dirtyepic) @ 2011-04-11 23:11 UTC (permalink / raw
To: gentoo-commits
dirtyepic 11/04/11 23:11:01
Modified: toolchain.eclass
Log:
Run tests in parallel as per http://gcc.gnu.org/ml/gcc/2011-03/msg00516.html
Revision Changes Path
1.459 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.459&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.459&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.458&r2=1.459
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.458
retrieving revision 1.459
diff -u -r1.458 -r1.459
--- toolchain.eclass 10 Apr 2011 18:21:20 -0000 1.458
+++ toolchain.eclass 11 Apr 2011 23:11:01 -0000 1.459
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.458 2011/04/10 18:21:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.459 2011/04/11 23:11:01 dirtyepic Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1727,7 +1727,7 @@
gcc_src_test() {
cd "${WORKDIR}"/build
- emake -j1 -k check || ewarn "check failed and that sucks :("
+ emake -k check || ewarn "check failed and that sucks :("
}
gcc-library_src_install() {
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-06-14 20:28 Matt Turner (mattst88)
0 siblings, 0 replies; 266+ messages in thread
From: Matt Turner (mattst88) @ 2011-06-14 20:28 UTC (permalink / raw
To: gentoo-commits
mattst88 11/06/14 20:28:20
Modified: toolchain.eclass
Log:
Use DEFAULT_ABI instead of USE flags to select primary MIPS ABI, bug 370717
Revision Changes Path
1.460 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.460&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.460&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.459&r2=1.460
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.459
retrieving revision 1.460
diff -u -r1.459 -r1.460
--- toolchain.eclass 11 Apr 2011 23:11:01 -0000 1.459
+++ toolchain.eclass 14 Jun 2011 20:28:20 -0000 1.460
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.459 2011/04/11 23:11:01 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.460 2011/06/14 20:28:20 mattst88 Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -152,11 +152,6 @@
if tc_version_is_at_least 3 ; then
IUSE+=" bootstrap doc gcj gtk hardened libffi multilib objc"
- # gcc-{nios2,bfin} don't accept these
- if [[ ${PN} == "gcc" ]] ; then
- IUSE+=" n32 n64"
- fi
-
tc_version_is_at_least "4.0" && IUSE+=" objc-gc mudflap"
tc_version_is_at_least "4.1" && IUSE+=" objc++"
tc_version_is_at_least "4.2" && IUSE+=" openmp"
@@ -787,27 +782,6 @@
[[ -z ${ETYPE} ]] && die "Your ebuild needs to set the ETYPE variable"
if [[ ${ETYPE} == "gcc-compiler" ]] ; then
- case $(tc-arch) in
- mips)
- # Must compile for mips64-linux target if we want n32/n64 support
- case "${CTARGET}" in
- mips64*) ;;
- *)
- if use n32 || use n64; then
- eerror "n32/n64 can only be used when target host is mips64*-*-linux-*";
- die "Invalid USE flags for CTARGET ($CTARGET)";
- fi
- ;;
- esac
-
- #cannot have both n32 & n64 without multilib
- if use n32 && use n64 && ! is_multilib; then
- eerror "Please enable multilib if you want to use both n32 & n64";
- die "Invalid USE flag combination";
- fi
- ;;
- esac
-
# Setup variables which would normally be in the profile
if is_crosscompile ; then
multilib_env ${CTARGET}
@@ -1234,8 +1208,8 @@
# Add --with-abi flags to set default MIPS ABI
mips)
local mips_abi=""
- use n64 && mips_abi="--with-abi=64"
- use n32 && mips_abi="--with-abi=n32"
+ [[ ${DEFAULT_ABI} == n64 ]] && mips_abi="--with-abi=64"
+ [[ ${DEFAULT_ABI} == n32 ]] && mips_abi="--with-abi=n32"
[[ -n ${mips_abi} ]] && confgcc="${confgcc} ${mips_abi}"
;;
# Default arch for x86 is normally i386, lets give it a bump
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-08-13 3:09 Ryan Hill (dirtyepic)
0 siblings, 0 replies; 266+ messages in thread
From: Ryan Hill (dirtyepic) @ 2011-08-13 3:09 UTC (permalink / raw
To: gentoo-commits
dirtyepic 11/08/13 03:09:40
Modified: toolchain.eclass
Log:
Check image dir rather than filesystem for multilib paths so we get proper LDPATHs on up/downgrades. Bug #377633.
Revision Changes Path
1.462 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.462&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.462&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.461&r2=1.462
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.461
retrieving revision 1.462
diff -u -r1.461 -r1.462
--- toolchain.eclass 8 Jul 2011 11:35:01 -0000 1.461
+++ toolchain.eclass 13 Aug 2011 03:09:40 -0000 1.462
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.461 2011/07/08 11:35:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.462 2011/08/13 03:09:40 dirtyepic Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -695,7 +695,7 @@
if is_multilib ; then
LDPATH="${LIBPATH}"
for path in 32 64 ; do
- [[ -d ${LIBPATH}/${path} ]] && LDPATH="${LDPATH}:${LIBPATH}/${path}"
+ [[ -d ${D}${LIBPATH}/${path} ]] && LDPATH="${LDPATH}:${LIBPATH}/${path}"
done
else
local MULTIDIR
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-08-22 2:19 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-08-22 2:19 UTC (permalink / raw
To: gentoo-commits
vapier 11/08/22 02:19:40
Modified: toolchain.eclass
Log:
drop cld workaround now that things should be stable #379367 by Alessandro Guido
Revision Changes Path
1.463 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.463&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.463&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.462&r2=1.463
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.462
retrieving revision 1.463
diff -u -r1.462 -r1.463
--- toolchain.eclass 13 Aug 2011 03:09:40 -0000 1.462
+++ toolchain.eclass 22 Aug 2011 02:19:40 -0000 1.463
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.462 2011/08/13 03:09:40 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.463 2011/08/22 02:19:40 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1145,15 +1145,6 @@
fi
fi
- # enable the cld workaround until we move things to stable.
- # by that point, the rest of the software out there should
- # have caught up.
- if tc_version_is_at_least "4.3" ; then
- if ! has ${ARCH} ${KEYWORDS} ; then
- confgcc="${confgcc} --enable-cld"
- fi
- fi
-
# Stick the python scripts in their own slotted directory
# bug #279252
#
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-08-22 23:03 Matt Turner (mattst88)
0 siblings, 0 replies; 266+ messages in thread
From: Matt Turner (mattst88) @ 2011-08-22 23:03 UTC (permalink / raw
To: gentoo-commits
mattst88 11/08/22 23:03:16
Modified: toolchain.eclass
Log:
Remove incorrect library path. Patch by Jonathan Callen <abcd@gentoo.org>. Bugs 289947 and 358149.
Revision Changes Path
1.464 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.464&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.464&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.463&r2=1.464
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.463
retrieving revision 1.464
diff -u -r1.463 -r1.464
--- toolchain.eclass 22 Aug 2011 02:19:40 -0000 1.463
+++ toolchain.eclass 22 Aug 2011 23:03:16 -0000 1.464
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.463 2011/08/22 02:19:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.464 2011/08/22 23:03:16 mattst88 Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1966,8 +1966,7 @@
${LIBPATH}/${OS_MULTIDIR} \
${LIBPATH}/../${MULTIDIR} \
${PREFIX}/lib/${OS_MULTIDIR} \
- ${PREFIX}/${CTARGET}/lib/${OS_MULTIDIR} \
- ${PREFIX}/lib/${MULTIDIR}
+ ${PREFIX}/${CTARGET}/lib/${OS_MULTIDIR}
do
removedirs="${removedirs} ${FROMDIR}"
FROMDIR=${D}${FROMDIR}
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-09-11 17:14 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-09-11 17:14 UTC (permalink / raw
To: gentoo-commits
vapier 11/09/11 17:14:24
Modified: toolchain.eclass
Log:
support x86_64 multilib settings with gcc-4.7+ as they changed the style to append the var rather than set it once
Revision Changes Path
1.465 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.465&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.465&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.464&r2=1.465
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.464
retrieving revision 1.465
diff -u -r1.464 -r1.465
--- toolchain.eclass 22 Aug 2011 23:03:16 -0000 1.464
+++ toolchain.eclass 11 Sep 2011 17:14:24 -0000 1.465
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.464 2011/08/22 23:03:16 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.465 2011/09/11 17:14:24 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -2369,13 +2369,7 @@
is_multilib || return 0
local config
- local libdirs
-
- if [[ ${SYMLINK_LIB} == "yes" ]] ; then
- libdirs="../lib64 ../lib32"
- else
- libdirs="../lib64 ../lib"
- fi
+ local libdirs="../lib64 ../lib32"
# this only makes sense for some Linux targets
case ${CTARGET} in
@@ -2387,8 +2381,18 @@
esac
config+="/t-linux64"
- einfo "updating multilib directories to be: ${libdirs}"
- sed -i -e "/^MULTILIB_OSDIRNAMES/s:=.*:= ${libdirs}:" "${S}"/gcc/config/${config} || die
+ if [[ ${SYMLINK_LIB} == "yes" ]] ; then
+ einfo "updating multilib directories to be: ${libdirs}"
+ if tc_version_is_at_least 4.7 && [[ ${CTARGET} == x86_64*-linux* ]] ; then
+ set -- -e '/^MULTILIB_OSDIRNAMES.*lib32/s:[$][(]if.*):../lib32:'
+ else
+ set -- -e "/^MULTILIB_OSDIRNAMES/s:=.*:= ${libdirs}:"
+ fi
+ else
+ einfo "using upstream multilib; disabling lib32 autodetection"
+ set -- -r -e 's:[$][(]if.*,(.*)[)]:\1:'
+ fi
+ sed -i "$@" "${S}"/gcc/config/${config} || die
}
disable_multilib_libjava() {
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-09-11 17:48 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-09-11 17:48 UTC (permalink / raw
To: gentoo-commits
vapier 11/09/11 17:48:19
Modified: toolchain.eclass
Log:
use += style with confgcc appending
Revision Changes Path
1.466 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.466&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.466&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.465&r2=1.466
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.465
retrieving revision 1.466
diff -u -r1.465 -r1.466
--- toolchain.eclass 11 Sep 2011 17:14:24 -0000 1.465
+++ toolchain.eclass 11 Sep 2011 17:48:19 -0000 1.466
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.465 2011/09/11 17:14:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.466 2011/09/11 17:48:19 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1093,36 +1093,36 @@
gcc-library-configure() {
if is_multilib ; then
- confgcc="${confgcc} --enable-multilib"
+ confgcc+=" --enable-multilib"
else
- confgcc="${confgcc} --disable-multilib"
+ confgcc+=" --disable-multilib"
fi
}
gcc-compiler-configure() {
if is_multilib ; then
- confgcc="${confgcc} --enable-multilib"
+ confgcc+=" --enable-multilib"
else
- confgcc="${confgcc} --disable-multilib"
+ confgcc+=" --disable-multilib"
fi
if tc_version_is_at_least "4.0" ; then
if has mudflap ${IUSE} ; then
- confgcc="${confgcc} $(use_enable mudflap libmudflap)"
+ confgcc+=" $(use_enable mudflap libmudflap)"
else
- confgcc="${confgcc} --disable-libmudflap"
+ confgcc+=" --disable-libmudflap"
fi
if want_libssp ; then
- confgcc="${confgcc} --enable-libssp"
+ confgcc+=" --enable-libssp"
else
export gcc_cv_libc_provides_ssp=yes
- confgcc="${confgcc} --disable-libssp"
+ confgcc+=" --disable-libssp"
fi
# If we want hardened support with the newer piepatchset for >=gcc 4.4
if tc_version_is_at_least 4.4 && want_minispecs ; then
- confgcc="${confgcc} $(use_enable hardened esp)"
+ confgcc+=" $(use_enable hardened esp)"
fi
if tc_version_is_at_least "4.2" ; then
@@ -1134,14 +1134,14 @@
if ! is_crosscompile || \
$(tc-getCPP ${CTARGET}) -E - <<<"#include <pthread.h>" >& /dev/null
then
- confgcc="${confgcc} $(use_enable openmp libgomp)"
+ confgcc+=" $(use_enable openmp libgomp)"
else
# Force disable as the configure script can be dumb #359855
- confgcc="${confgcc} --disable-libgomp"
+ confgcc+=" --disable-libgomp"
fi
else
# For gcc variants where we don't want openmp (e.g. kgcc)
- confgcc="${confgcc} --disable-libgomp"
+ confgcc+=" --disable-libgomp"
fi
fi
@@ -1156,25 +1156,25 @@
#
# This should translate into "/share/gcc-data/${CTARGET}/${GCC_CONFIG_VER}/python"
if tc_version_is_at_least "4.4" ; then
- confgcc="${confgcc} --with-python-dir=${DATAPATH/$PREFIX/}/python"
+ confgcc+=" --with-python-dir=${DATAPATH/$PREFIX/}/python"
fi
fi
# For newer versions of gcc, use the default ("release"), because no
# one (even upstream apparently) tests with it disabled. #317217
if tc_version_is_at_least 4 || [[ -n ${GCC_CHECKS_LIST} ]] ; then
- confgcc="${confgcc} --enable-checking=${GCC_CHECKS_LIST:-release}"
+ confgcc+=" --enable-checking=${GCC_CHECKS_LIST:-release}"
else
- confgcc="${confgcc} --disable-checking"
+ confgcc+=" --disable-checking"
fi
# GTK+ is preferred over xlib in 3.4.x (xlib is unmaintained
# right now). Much thanks to <csm@gnu.org> for the heads up.
# Travis Tilley <lv@gentoo.org> (11 Jul 2004)
if ! is_gcj ; then
- confgcc="${confgcc} --disable-libgcj"
+ confgcc+=" --disable-libgcj"
elif use gtk ; then
- confgcc="${confgcc} --enable-java-awt=gtk"
+ confgcc+=" --enable-java-awt=gtk"
fi
case $(tc-arch) in
@@ -1187,13 +1187,13 @@
# Remove endian ('l' / 'eb')
[[ ${arm_arch} == *l ]] && arm_arch=${arm_arch%l}
[[ ${arm_arch} == *eb ]] && arm_arch=${arm_arch%eb}
- confgcc="${confgcc} --with-arch=${arm_arch}"
+ confgcc+=" --with-arch=${arm_arch}"
fi
# Enable hardvfp
if [[ ${CTARGET##*-} == *eabi ]] && [[ $(tc-is-hardfloat) == yes ]] && \
tc_version_is_at_least "4.5" ; then
- confgcc="${confgcc} --with-float=hard"
+ confgcc+=" --with-float=hard"
fi
;;
# Add --with-abi flags to set default MIPS ABI
@@ -1201,16 +1201,16 @@
local mips_abi=""
[[ ${DEFAULT_ABI} == n64 ]] && mips_abi="--with-abi=64"
[[ ${DEFAULT_ABI} == n32 ]] && mips_abi="--with-abi=n32"
- [[ -n ${mips_abi} ]] && confgcc="${confgcc} ${mips_abi}"
+ [[ -n ${mips_abi} ]] && confgcc+=" ${mips_abi}"
;;
# Default arch for x86 is normally i386, lets give it a bump
# since glibc will do so based on CTARGET anyways
x86)
- confgcc="${confgcc} --with-arch=${CTARGET%%-*}"
+ confgcc+=" --with-arch=${CTARGET%%-*}"
;;
# Enable sjlj exceptions for backward compatibility on hppa
hppa)
- [[ ${GCCMAJOR} == "3" ]] && confgcc="${confgcc} --enable-sjlj-exceptions"
+ [[ ${GCCMAJOR} == "3" ]] && confgcc+=" --enable-sjlj-exceptions"
;;
# Set up defaults based on current CFLAGS
ppc)
@@ -1227,7 +1227,7 @@
if is_objc || is_objcxx ; then
GCC_LANG="${GCC_LANG},objc"
if tc_version_is_at_least "4.0" ; then
- use objc-gc && confgcc="${confgcc} --enable-objc-gc"
+ use objc-gc && confgcc+=" --enable-objc-gc"
fi
is_objcxx && GCC_LANG="${GCC_LANG},obj-c++"
fi
@@ -1262,7 +1262,7 @@
local confgcc
# Set configuration based on path variables
- confgcc="${confgcc} \
+ confgcc+=" \
--prefix=${PREFIX} \
--bindir=${BINPATH} \
--includedir=${INCLUDEPATH} \
@@ -1275,41 +1275,41 @@
# non-Darwin we screw up the behaviour this eclass relies on. We in
# particular need this over --libdir for bug #255315.
[[ ${CTARGET} == *-darwin* ]] && \
- confgcc="${confgcc} --enable-version-specific-runtime-libs"
+ confgcc+=" --enable-version-specific-runtime-libs"
# All our cross-compile logic goes here ! woo !
- confgcc="${confgcc} --host=${CHOST}"
+ confgcc+=" --host=${CHOST}"
if is_crosscompile || tc-is-cross-compiler ; then
# Straight from the GCC install doc:
# "GCC has code to correctly determine the correct value for target
# for nearly all native systems. Therefore, we highly recommend you
# not provide a configure target when configuring a native compiler."
- confgcc="${confgcc} --target=${CTARGET}"
+ confgcc+=" --target=${CTARGET}"
fi
- [[ -n ${CBUILD} ]] && confgcc="${confgcc} --build=${CBUILD}"
+ [[ -n ${CBUILD} ]] && confgcc+=" --build=${CBUILD}"
# ppc altivec support
- confgcc="${confgcc} $(use_enable altivec)"
+ confgcc+=" $(use_enable altivec)"
# gcc has fixed-point arithmetic support in 4.3 for mips targets that can
# significantly increase compile time by several hours. This will allow
# users to control this feature in the event they need the support.
- tc_version_is_at_least "4.3" && confgcc="${confgcc} $(use_enable fixed-point)"
+ tc_version_is_at_least "4.3" && confgcc+=" $(use_enable fixed-point)"
# Graphite support was added in 4.4, which depends on external libraries
# for optimizations. Up to 4.6 we use cloog-ppl (cloog fork with Parma PPL
# backend). Later versions will use upstream cloog with the ISL backend. We
# disable the PPL version check so we can use >=ppl-0.11.
if tc_version_is_at_least "4.4"; then
- confgcc="${confgcc} $(use_with graphite ppl)"
- confgcc="${confgcc} $(use_with graphite cloog)"
+ confgcc+=" $(use_with graphite ppl)"
+ confgcc+=" $(use_with graphite cloog)"
if use graphite; then
- confgcc="${confgcc} --disable-ppl-version-check"
+ confgcc+=" --disable-ppl-version-check"
# this will be removed when cloog-ppl-0.15.10 goes stable
if has_version '>=dev-libs/cloog-ppl-0.15.10'; then
- confgcc="${confgcc} --with-cloog-include=/usr/include/cloog-ppl"
+ confgcc+=" --with-cloog-include=/usr/include/cloog-ppl"
else
- confgcc="${confgcc} --with-cloog-include=/usr/include/cloog"
+ confgcc+=" --with-cloog-include=/usr/include/cloog"
fi
fi
fi
@@ -1317,21 +1317,21 @@
# LTO support was added in 4.5, which depends upon elfutils. This allows
# users to enable that option, and pull in the additional library. In 4.6,
# the dependency is no longer required.
- [[ ${GCC_BRANCH_VER} == 4.5 ]] && confgcc="${confgcc} $(use_enable lto)"
- [[ ${GCC_BRANCH_VER} > 4.5 ]] && confgcc="${confgcc} --enable-lto"
+ [[ ${GCC_BRANCH_VER} == 4.5 ]] && confgcc+=" $(use_enable lto)"
+ [[ ${GCC_BRANCH_VER} > 4.5 ]] && confgcc+=" --enable-lto"
- [[ $(tc-is-softfloat) == "yes" ]] && confgcc="${confgcc} --with-float=soft"
- [[ $(tc-is-hardfloat) == "yes" ]] && confgcc="${confgcc} --with-float=hard"
+ [[ $(tc-is-softfloat) == "yes" ]] && confgcc+=" --with-float=soft"
+ [[ $(tc-is-hardfloat) == "yes" ]] && confgcc+=" --with-float=hard"
# Native Language Support
if use nls ; then
- confgcc="${confgcc} --enable-nls --without-included-gettext"
+ confgcc+=" --enable-nls --without-included-gettext"
else
- confgcc="${confgcc} --disable-nls"
+ confgcc+=" --disable-nls"
fi
# reasonably sane globals (hopefully)
- confgcc="${confgcc} \
+ confgcc+=" \
--with-system-zlib \
--disable-werror \
--enable-secureplt"
@@ -1343,7 +1343,7 @@
# if not specified, assume we are building for a target that only
# requires C support
GCC_LANG=${GCC_LANG:-c}
- confgcc="${confgcc} --enable-languages=${GCC_LANG}"
+ confgcc+=" --enable-languages=${GCC_LANG}"
if is_crosscompile ; then
# When building a stage1 cross-compiler (just C compiler), we have to
@@ -1359,59 +1359,59 @@
*-uclibc*) needed_libc=uclibc;;
*-cygwin) needed_libc=cygwin;;
mingw*|*-mingw*) needed_libc=mingw-runtime;;
- avr) confgcc="${confgcc} --enable-shared --disable-threads";;
+ avr) confgcc+=" --enable-shared --disable-threads";;
esac
if [[ -n ${needed_libc} ]] ; then
if ! has_version ${CATEGORY}/${needed_libc} ; then
- confgcc="${confgcc} --disable-shared --disable-threads --without-headers"
+ confgcc+=" --disable-shared --disable-threads --without-headers"
elif built_with_use --hidden --missing false ${CATEGORY}/${needed_libc} crosscompile_opts_headers-only ; then
- confgcc="${confgcc} --disable-shared --with-sysroot=${PREFIX}/${CTARGET}"
+ confgcc+=" --disable-shared --with-sysroot=${PREFIX}/${CTARGET}"
else
- confgcc="${confgcc} --with-sysroot=${PREFIX}/${CTARGET}"
+ confgcc+=" --with-sysroot=${PREFIX}/${CTARGET}"
fi
fi
if [[ ${GCCMAJOR}.${GCCMINOR} > 4.1 ]] ; then
- confgcc="${confgcc} --disable-bootstrap"
+ confgcc+=" --disable-bootstrap"
fi
else
if tc-is-static-only ; then
- confgcc="${confgcc} --disable-shared"
+ confgcc+=" --disable-shared"
else
- confgcc="${confgcc} --enable-shared"
+ confgcc+=" --enable-shared"
fi
case ${CHOST} in
mingw*|*-mingw*|*-cygwin)
- confgcc="${confgcc} --enable-threads=win32" ;;
+ confgcc+=" --enable-threads=win32" ;;
*)
- confgcc="${confgcc} --enable-threads=posix" ;;
+ confgcc+=" --enable-threads=posix" ;;
esac
fi
# __cxa_atexit is "essential for fully standards-compliant handling of
# destructors", but apparently requires glibc.
case ${CTARGET} in
*-uclibc*)
- confgcc="${confgcc} --disable-__cxa_atexit --enable-target-optspace $(use_enable nptl tls)"
- [[ ${GCCMAJOR}.${GCCMINOR} == 3.3 ]] && confgcc="${confgcc} --enable-sjlj-exceptions"
+ confgcc+=" --disable-__cxa_atexit --enable-target-optspace $(use_enable nptl tls)"
+ [[ ${GCCMAJOR}.${GCCMINOR} == 3.3 ]] && confgcc+=" --enable-sjlj-exceptions"
if tc_version_is_at_least 3.4 && [[ ${GCCMAJOR}.${GCCMINOR} < 4.3 ]] ; then
- confgcc="${confgcc} --enable-clocale=uclibc"
+ confgcc+=" --enable-clocale=uclibc"
fi
;;
*-elf|*-eabi)
- confgcc="${confgcc} --with-newlib"
+ confgcc+=" --with-newlib"
;;
*-gnu*)
- confgcc="${confgcc} --enable-__cxa_atexit"
- confgcc="${confgcc} --enable-clocale=gnu"
+ confgcc+=" --enable-__cxa_atexit"
+ confgcc+=" --enable-clocale=gnu"
;;
*-freebsd*)
- confgcc="${confgcc} --enable-__cxa_atexit"
+ confgcc+=" --enable-__cxa_atexit"
;;
*-solaris*)
- confgcc="${confgcc} --enable-__cxa_atexit"
+ confgcc+=" --enable-__cxa_atexit"
;;
esac
- [[ ${GCCMAJOR}.${GCCMINOR} < 3.4 ]] && confgcc="${confgcc} --disable-libunwind-exceptions"
+ [[ ${GCCMAJOR}.${GCCMINOR} < 3.4 ]] && confgcc+=" --disable-libunwind-exceptions"
# create a sparc*linux*-{gcc,g++} that can handle -m32 and -m64 (biarch)
if [[ ${CTARGET} == sparc*linux* ]] \
@@ -1419,7 +1419,7 @@
&& ! is_crosscompile \
&& [[ ${GCCMAJOR}.${GCCMINOR} > 4.2 ]]
then
- confgcc="${confgcc} --enable-targets=all"
+ confgcc+=" --enable-targets=all"
fi
tc_version_is_at_least 4.3 && set -- "$@" \
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-09-12 5:40 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-09-12 5:40 UTC (permalink / raw
To: gentoo-commits
vapier 11/09/12 05:40:23
Modified: toolchain.eclass
Log:
handle newer cxx behavior with gcc-4.7+, and newer libquadmath/fortran with gcc-4.6+
Revision Changes Path
1.467 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.467&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.467&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.466&r2=1.467
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.466
retrieving revision 1.467
diff -u -r1.466 -r1.467
--- toolchain.eclass 11 Sep 2011 17:48:19 -0000 1.466
+++ toolchain.eclass 12 Sep 2011 05:40:23 -0000 1.467
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.466 2011/09/11 17:48:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.467 2011/09/12 05:40:23 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1177,6 +1177,18 @@
confgcc+=" --enable-java-awt=gtk"
fi
+ # newer gcc versions like to bootstrap themselves with C++,
+ # so we need to manually disable it ourselves
+ if tc_version_is_at_least 4.7 && ! is_cxx ; then
+ confgcc+=" --disable-build-with-cxx --disable-build-poststage1-with-cxx"
+ fi
+
+ # newer gcc's come with libquadmath, but only fortran uses
+ # it, so auto punt it when we don't care
+ if tc_version_is_at_least 4.6 && ! is_fortran ; then
+ confgcc+=" --disable-libquadmath"
+ fi
+
case $(tc-arch) in
arm) #264534
local arm_arch="${CTARGET%%-*}"
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-09-13 16:30 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-09-13 16:30 UTC (permalink / raw
To: gentoo-commits
vapier 11/09/13 16:30:00
Modified: toolchain.eclass
Log:
support gcc-4.7+ multilib list with x86_64 targets
Revision Changes Path
1.468 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.468&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.468&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.467&r2=1.468
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.467
retrieving revision 1.468
diff -u -r1.467 -r1.468
--- toolchain.eclass 12 Sep 2011 05:40:23 -0000 1.467
+++ toolchain.eclass 13 Sep 2011 16:30:00 -0000 1.468
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.467 2011/09/12 05:40:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.468 2011/09/13 16:30:00 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1091,20 +1091,37 @@
disable_multilib_libjava || die "failed to disable multilib java"
}
-gcc-library-configure() {
- if is_multilib ; then
- confgcc+=" --enable-multilib"
- else
+gcc-multilib-configure() {
+ # if multilib is disabled, get out quick!
+ if ! is_multilib ; then
confgcc+=" --disable-multilib"
+ return
+ else
+ confgcc+=" --enable-multilib"
fi
+
+ # translate our notion of multilibs into gcc's
+ local abi map=() list
+ case ${CTARGET} in
+ x86_64*) tc_version_is_at_least 4.7 && map=(amd64:m64 x86:m32 x32:mx32) ;;
+ esac
+ for abi in $(get_all_abis) ; do
+ local m a l
+ for m in "${map[@]}" ; do
+ a=${m%:*}
+ l=${m#*:}
+ [[ ${abi} == ${a} ]] && list=",${l}${list}"
+ done
+ done
+ [[ -n ${list} ]] && confgcc+=" --with-multilib-list=${list:1}"
+}
+
+gcc-library-configure() {
+ gcc-multilib-configure
}
gcc-compiler-configure() {
- if is_multilib ; then
- confgcc+=" --enable-multilib"
- else
- confgcc+=" --disable-multilib"
- fi
+ gcc-multilib-configure
if tc_version_is_at_least "4.0" ; then
if has mudflap ${IUSE} ; then
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-09-22 23:08 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-09-22 23:08 UTC (permalink / raw
To: gentoo-commits
vapier 11/09/22 23:08:28
Modified: toolchain.eclass
Log:
drop support for gcc-library builds as no one uses/cares about it
Revision Changes Path
1.469 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.469&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.469&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.468&r2=1.469
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.468
retrieving revision 1.469
diff -u -r1.468 -r1.469
--- toolchain.eclass 13 Sep 2011 16:30:00 -0000 1.468
+++ toolchain.eclass 22 Sep 2011 23:08:28 -0000 1.469
@@ -1,48 +1,20 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.468 2011/09/13 16:30:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.469 2011/09/22 23:08:28 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
+#---->> eclass stuff <<----
HOMEPAGE="http://gcc.gnu.org/"
LICENSE="GPL-2 LGPL-2.1"
RESTRICT="strip" # cross-compilers need controlled stripping
-#---->> eclass stuff <<----
inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib fixheadtails
EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_test pkg_preinst src_install pkg_postinst pkg_prerm pkg_postrm
DESCRIPTION="Based on the ${ECLASS} eclass"
FEATURES=${FEATURES/multilib-strict/}
-
-toolchain_pkg_setup() {
- gcc_pkg_setup
-}
-toolchain_src_unpack() {
- gcc_src_unpack
-}
-toolchain_src_compile() {
- gcc_src_compile
-}
-toolchain_src_test() {
- gcc_src_test
-}
-toolchain_pkg_preinst() {
- ${ETYPE}_pkg_preinst
-}
-toolchain_src_install() {
- ${ETYPE}_src_install
-}
-toolchain_pkg_postinst() {
- ${ETYPE}_pkg_postinst
-}
-toolchain_pkg_prerm() {
- ${ETYPE}_pkg_prerm
-}
-toolchain_pkg_postrm() {
- ${ETYPE}_pkg_postrm
-}
#----<< eclass stuff >>----
@@ -59,7 +31,6 @@
tc_version_is_at_least() { version_is_at_least "$1" "${2:-${GCC_RELEASE_VER}}" ; }
-
GCC_PV=${TOOLCHAIN_GCC_PV:-${PV}}
GCC_PVR=${GCC_PV}
[[ ${PR} != "r0" ]] && GCC_PVR=${GCC_PVR}-${PR}
@@ -88,91 +59,65 @@
fi
export GCC_FILESDIR=${GCC_FILESDIR:-${FILESDIR}}
-if [[ ${ETYPE} == "gcc-library" ]] ; then
- GCC_VAR_TYPE=${GCC_VAR_TYPE:-non-versioned}
- GCC_LIB_COMPAT_ONLY=${GCC_LIB_COMPAT_ONLY:-true}
-else
- GCC_VAR_TYPE=${GCC_VAR_TYPE:-versioned}
- GCC_LIB_COMPAT_ONLY="false"
-fi
-
PREFIX=${TOOLCHAIN_PREFIX:-/usr}
-if [[ ${GCC_VAR_TYPE} == "versioned" ]] ; then
- if tc_version_is_at_least 3.4.0 ; then
- LIBPATH=${TOOLCHAIN_LIBPATH:-${PREFIX}/lib/gcc/${CTARGET}/${GCC_CONFIG_VER}}
- else
- LIBPATH=${TOOLCHAIN_LIBPATH:-${PREFIX}/lib/gcc-lib/${CTARGET}/${GCC_CONFIG_VER}}
- fi
- INCLUDEPATH=${TOOLCHAIN_INCLUDEPATH:-${LIBPATH}/include}
- if is_crosscompile ; then
- BINPATH=${TOOLCHAIN_BINPATH:-${PREFIX}/${CHOST}/${CTARGET}/gcc-bin/${GCC_CONFIG_VER}}
- else
- BINPATH=${TOOLCHAIN_BINPATH:-${PREFIX}/${CTARGET}/gcc-bin/${GCC_CONFIG_VER}}
- fi
- DATAPATH=${TOOLCHAIN_DATAPATH:-${PREFIX}/share/gcc-data/${CTARGET}/${GCC_CONFIG_VER}}
- # Dont install in /usr/include/g++-v3/, but in gcc internal directory.
- # We will handle /usr/include/g++-v3/ with gcc-config ...
- STDCXX_INCDIR=${TOOLCHAIN_STDCXX_INCDIR:-${LIBPATH}/include/g++-v${GCC_BRANCH_VER/\.*/}}
-elif [[ ${GCC_VAR_TYPE} == "non-versioned" ]] ; then
- # using non-versioned directories to install gcc, like what is currently
- # done for ppc64 and 3.3.3_pre, is a BAD IDEA. DO NOT do it!! However...
- # setting up variables for non-versioned directories might be useful for
- # specific gcc targets, like libffi. Note that we dont override the value
- # returned by get_libdir here.
- LIBPATH=${TOOLCHAIN_LIBPATH:-${PREFIX}/$(get_libdir)}
- INCLUDEPATH=${TOOLCHAIN_INCLUDEPATH:-${PREFIX}/include}
- BINPATH=${TOOLCHAIN_BINPATH:-${PREFIX}/bin}
- DATAPATH=${TOOLCHAIN_DATAPATH:-${PREFIX}/share}
- STDCXX_INCDIR=${TOOLCHAIN_STDCXX_INCDIR:-${PREFIX}/include/g++-v3}
+if tc_version_is_at_least 3.4.0 ; then
+ LIBPATH=${TOOLCHAIN_LIBPATH:-${PREFIX}/lib/gcc/${CTARGET}/${GCC_CONFIG_VER}}
+else
+ LIBPATH=${TOOLCHAIN_LIBPATH:-${PREFIX}/lib/gcc-lib/${CTARGET}/${GCC_CONFIG_VER}}
fi
+INCLUDEPATH=${TOOLCHAIN_INCLUDEPATH:-${LIBPATH}/include}
+if is_crosscompile ; then
+ BINPATH=${TOOLCHAIN_BINPATH:-${PREFIX}/${CHOST}/${CTARGET}/gcc-bin/${GCC_CONFIG_VER}}
+else
+ BINPATH=${TOOLCHAIN_BINPATH:-${PREFIX}/${CTARGET}/gcc-bin/${GCC_CONFIG_VER}}
+fi
+DATAPATH=${TOOLCHAIN_DATAPATH:-${PREFIX}/share/gcc-data/${CTARGET}/${GCC_CONFIG_VER}}
+# Dont install in /usr/include/g++-v3/, but in gcc internal directory.
+# We will handle /usr/include/g++-v3/ with gcc-config ...
+STDCXX_INCDIR=${TOOLCHAIN_STDCXX_INCDIR:-${LIBPATH}/include/g++-v${GCC_BRANCH_VER/\.*/}}
#----<< globals >>----
#---->> SLOT+IUSE logic <<----
-if [[ ${ETYPE} == "gcc-library" ]] ; then
- IUSE="nls build test"
- SLOT="${CTARGET}-${SO_VERSION_SLOT:-5}"
-else
- IUSE="multislot nptl test"
+IUSE="multislot nptl test"
+
+if tc_version_is_at_least 3 ; then
+ IUSE+=" vanilla"
+fi
+
+if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then
+ IUSE+=" altivec build fortran nls nocxx"
+ [[ -n ${PIE_VER} ]] && IUSE+=" nopie"
+ [[ -n ${PP_VER} ]] && IUSE+=" nossp"
+ [[ -n ${SPECS_VER} ]] && IUSE+=" nossp"
+ [[ -n ${HTB_VER} ]] && IUSE+=" boundschecking"
+ [[ -n ${D_VER} ]] && IUSE+=" d"
if tc_version_is_at_least 3 ; then
- IUSE+=" vanilla"
- fi
+ IUSE+=" bootstrap doc gcj gtk hardened libffi multilib objc"
- if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then
- IUSE+=" altivec build fortran nls nocxx"
- [[ -n ${PIE_VER} ]] && IUSE+=" nopie"
- [[ -n ${PP_VER} ]] && IUSE+=" nossp"
- [[ -n ${SPECS_VER} ]] && IUSE+=" nossp"
- [[ -n ${HTB_VER} ]] && IUSE+=" boundschecking"
- [[ -n ${D_VER} ]] && IUSE+=" d"
-
- if tc_version_is_at_least 3 ; then
- IUSE+=" bootstrap doc gcj gtk hardened libffi multilib objc"
-
- tc_version_is_at_least "4.0" && IUSE+=" objc-gc mudflap"
- tc_version_is_at_least "4.1" && IUSE+=" objc++"
- tc_version_is_at_least "4.2" && IUSE+=" openmp"
- tc_version_is_at_least "4.3" && IUSE+=" fixed-point"
- if tc_version_is_at_least "4.4" ; then
- IUSE+=" graphite"
- [[ -n ${SPECS_VER} ]] && IUSE+=" nossp"
- fi
- [[ ${GCC_BRANCH_VER} == 4.5 ]] && IUSE+=" lto"
- tc_version_is_at_least "4.6" && IUSE+=" go"
+ tc_version_is_at_least "4.0" && IUSE+=" objc-gc mudflap"
+ tc_version_is_at_least "4.1" && IUSE+=" objc++"
+ tc_version_is_at_least "4.2" && IUSE+=" openmp"
+ tc_version_is_at_least "4.3" && IUSE+=" fixed-point"
+ if tc_version_is_at_least "4.4" ; then
+ IUSE+=" graphite"
+ [[ -n ${SPECS_VER} ]] && IUSE+=" nossp"
fi
+ [[ ${GCC_BRANCH_VER} == 4.5 ]] && IUSE+=" lto"
+ tc_version_is_at_least "4.6" && IUSE+=" go"
fi
+fi
- # Support upgrade paths here or people get pissed
- if use multislot ; then
- SLOT="${CTARGET}-${GCC_CONFIG_VER}"
- elif is_crosscompile; then
- SLOT="${CTARGET}-${GCC_BRANCH_VER}"
- else
- SLOT="${GCC_BRANCH_VER}"
- fi
+# Support upgrade paths here or people get pissed
+if use multislot ; then
+ SLOT="${CTARGET}-${GCC_CONFIG_VER}"
+elif is_crosscompile; then
+ SLOT="${CTARGET}-${GCC_BRANCH_VER}"
+else
+ SLOT="${GCC_BRANCH_VER}"
fi
#----<< SLOT+IUSE logic >>----
@@ -180,12 +125,7 @@
#---->> S + SRC_URI essentials <<----
# This function sets the source directory depending on whether we're using
-# a prerelease, snapshot, or release tarball. To use it, just set S with:
-#
-# S="$(gcc_get_s_dir)"
-#
-# Travis Tilley <lv@gentoo.org> (03 Sep 2004)
-#
+# a prerelease, snapshot, or release tarball.
gcc_get_s_dir() {
local GCC_S
if [[ -n ${PRERELEASE} ]] ; then
@@ -197,6 +137,7 @@
fi
echo "${GCC_S}"
}
+S=$(gcc_get_s_dir)
# This function handles the basics of setting the SRC_URI for a gcc ebuild.
# To use, set SRC_URI with:
@@ -376,7 +317,6 @@
echo "${GCC_SRC_URI}"
}
-S=$(gcc_get_s_dir)
SRC_URI=$(get_gcc_src_uri)
#---->> S + SRC_URI essentials >>----
@@ -778,7 +718,7 @@
#----<< specs + env.d logic >>----
#---->> pkg_* <<----
-gcc_pkg_setup() {
+toolchain_pkg_setup() {
[[ -z ${ETYPE} ]] && die "Your ebuild needs to set the ETYPE variable"
if [[ ${ETYPE} == "gcc-compiler" ]] ; then
@@ -807,11 +747,11 @@
unset LANGUAGES #265283
}
-gcc-compiler_pkg_preinst() {
+toolchain_pkg_preinst() {
:
}
-gcc-compiler_pkg_postinst() {
+toolchain_pkg_postinst() {
do_gcc_config
if ! is_crosscompile ; then
@@ -863,13 +803,13 @@
fi
}
-gcc-compiler_pkg_prerm() {
+toolchain_pkg_prerm() {
# Don't let these files be uninstalled #87647
touch -c "${ROOT}"/sbin/fix_libtool_files.sh \
"${ROOT}"/$(get_libdir)/rcscripts/awk/fixlafiles.awk
}
-gcc-compiler_pkg_postrm() {
+toolchain_pkg_postrm() {
# to make our lives easier (and saner), we do the fix_libtool stuff here.
# rather than checking SLOT's and trying in upgrade paths, we just see if
# the common libstdc++.la exists in the ${LIBPATH} of the gcc that we are
@@ -937,9 +877,6 @@
"${S}"/configure || die
fi
}
-gcc-library_src_unpack() {
- :
-}
guess_patch_type_in_dir() {
[[ -n $(ls "$1"/*.bz2 2>/dev/null) ]] \
&& EPATCH_SUFFIX="patch.bz2" \
@@ -979,7 +916,7 @@
die "Failed to fixup file ${jfile} for rename to grmic"
done
}
-gcc_src_unpack() {
+toolchain_src_unpack() {
export BRANDING_GCC_PKGVERSION="Gentoo ${GCC_PVR}"
[[ -z ${UCLIBC_VER} ]] && [[ ${CTARGET} == *-uclibc* ]] && die "Sorry, this version does not support uClibc"
@@ -1116,10 +1053,6 @@
[[ -n ${list} ]] && confgcc+=" --with-multilib-list=${list:1}"
}
-gcc-library-configure() {
- gcc-multilib-configure
-}
-
gcc-compiler-configure() {
gcc-multilib-configure
@@ -1569,34 +1502,6 @@
popd
}
-# This function will add ${GCC_CONFIG_VER} to the names of all shared libraries in the
-# directory specified to avoid filename collisions between multiple slotted
-# non-versioned gcc targets. If no directory is specified, it is assumed that
-# you want -all- shared objects to have ${GCC_CONFIG_VER} added. Example
-#
-# add_version_to_shared ${D}/usr/$(get_libdir)
-#
-# Travis Tilley <lv@gentoo.org> (05 Sep 2004)
-#
-add_version_to_shared() {
- local sharedlib sharedlibdir
- [[ -z $1 ]] \
- && sharedlibdir=${D} \
- || sharedlibdir=$1
-
- for sharedlib in $(find ${sharedlibdir} -name *.so.*) ; do
- if [[ ! -L ${sharedlib} ]] ; then
- einfo "Renaming `basename "${sharedlib}"` to `basename "${sharedlib/.so*/}-${GCC_CONFIG_VER}.so.${sharedlib/*.so./}"`"
- mv "${sharedlib}" "${sharedlib/.so*/}-${GCC_CONFIG_VER}.so.${sharedlib/*.so./}" \
- || die
- pushd `dirname "${sharedlib}"` > /dev/null || die
- ln -sf "`basename "${sharedlib/.so*/}-${GCC_CONFIG_VER}.so.${sharedlib/*.so./}"`" \
- "`basename "${sharedlib}"`" || die
- popd > /dev/null || die
- fi
- done
-}
-
# This is mostly a stub function to be overwritten in an ebuild
gcc_do_filter_flags() {
strip-flags
@@ -1680,7 +1585,7 @@
export GCJFLAGS=${GCJFLAGS:-${CFLAGS}}
}
-gcc_src_compile() {
+toolchain_src_compile() {
gcc_do_filter_flags
einfo "CFLAGS=\"${CFLAGS}\""
einfo "CXXFLAGS=\"${CXXFLAGS}\""
@@ -1719,51 +1624,12 @@
popd > /dev/null
}
-gcc_src_test() {
+toolchain_src_test() {
cd "${WORKDIR}"/build
emake -k check || ewarn "check failed and that sucks :("
}
-gcc-library_src_install() {
- # Do the 'make install' from the build directory
- cd "${WORKDIR}"/build
- S=${WORKDIR}/build \
- emake -j1 \
- DESTDIR="${D}" \
- prefix=${PREFIX} \
- bindir=${BINPATH} \
- includedir=${LIBPATH}/include \
- datadir=${DATAPATH} \
- mandir=${DATAPATH}/man \
- infodir=${DATAPATH}/info \
- LIBPATH="${LIBPATH}" \
- ${GCC_INSTALL_TARGET} || die
-
- if [[ ${GCC_LIB_COMPAT_ONLY} == "true" ]] ; then
- rm -rf "${D}"${INCLUDEPATH}
- rm -rf "${D}"${DATAPATH}
- pushd "${D}"${LIBPATH}/
- rm *.a *.la *.so
- popd
- fi
-
- if [[ -n ${GCC_LIB_USE_SUBDIR} ]] ; then
- mkdir -p "${WORKDIR}"/${GCC_LIB_USE_SUBDIR}/
- mv "${D}"${LIBPATH}/* "${WORKDIR}"/${GCC_LIB_USE_SUBDIR}/
- mv "${WORKDIR}"/${GCC_LIB_USE_SUBDIR}/ "${D}"${LIBPATH}
-
- dodir /etc/env.d
- echo "LDPATH=\"${LIBPATH}/${GCC_LIB_USE_SUBDIR}/\"" >> "${D}"/etc/env.d/99${PN}
- fi
-
- if [[ ${GCC_VAR_TYPE} == "non-versioned" ]] ; then
- # if we're not using versioned directories, we need to use versioned
- # filenames.
- add_version_to_shared
- fi
-}
-
-gcc-compiler_src_install() {
+toolchain_src_install() {
local x=
cd "${WORKDIR}"/build
@@ -2528,3 +2394,9 @@
#use treelang
return 0
}
+
+# should kill these off once all the ebuilds are migrated
+gcc_pkg_setup() { toolchain_pkg_setup ; }
+gcc_src_unpack() { toolchain_src_unpack ; }
+gcc_src_compile() { toolchain_src_compile ; }
+gcc_src_test() { toolchain_src_test ; }
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-09-26 17:32 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-09-26 17:32 UTC (permalink / raw
To: gentoo-commits
vapier 11/09/26 17:32:44
Modified: toolchain.eclass
Log:
scrub more ETYPE logic
Revision Changes Path
1.470 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.470&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.470&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.469&r2=1.470
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.469
retrieving revision 1.470
diff -u -r1.469 -r1.470
--- toolchain.eclass 22 Sep 2011 23:08:28 -0000 1.469
+++ toolchain.eclass 26 Sep 2011 17:32:44 -0000 1.470
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.469 2011/09/22 23:08:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.470 2011/09/26 17:32:44 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -719,25 +719,21 @@
#---->> pkg_* <<----
toolchain_pkg_setup() {
- [[ -z ${ETYPE} ]] && die "Your ebuild needs to set the ETYPE variable"
-
- if [[ ${ETYPE} == "gcc-compiler" ]] ; then
- # Setup variables which would normally be in the profile
- if is_crosscompile ; then
- multilib_env ${CTARGET}
- if ! is_multilib ; then
- MULTILIB_ABIS=${DEFAULT_ABI}
- fi
+ # Setup variables which would normally be in the profile
+ if is_crosscompile ; then
+ multilib_env ${CTARGET}
+ if ! is_multilib ; then
+ MULTILIB_ABIS=${DEFAULT_ABI}
fi
+ fi
- # we dont want to use the installed compiler's specs to build gcc!
- unset GCC_SPECS
+ # we dont want to use the installed compiler's specs to build gcc!
+ unset GCC_SPECS
- if use nocxx ; then
- use go && ewarn 'Go requires a C++ compiler, disabled due to USE="nocxx"'
- use objc++ && ewarn 'Obj-C++ requires a C++ compiler, disabled due to USE="nocxx"'
- use gcj && ewarn 'GCJ requires a C++ compiler, disabled due to USE="nocxx"'
- fi
+ if use nocxx ; then
+ use go && ewarn 'Go requires a C++ compiler, disabled due to USE="nocxx"'
+ use objc++ && ewarn 'Obj-C++ requires a C++ compiler, disabled due to USE="nocxx"'
+ use gcj && ewarn 'GCJ requires a C++ compiler, disabled due to USE="nocxx"'
fi
want_libssp && libc_has_ssp && \
@@ -847,36 +843,6 @@
#---->> src_* <<----
-# generic GCC src_unpack, to be called from the ebuild's src_unpack.
-# BIG NOTE regarding hardened support: ebuilds with support for hardened are
-# expected to export the following variable:
-#
-# HARDENED_GCC_WORKS
-# This variable should be set to the archs on which hardened should
-# be allowed. For example: HARDENED_GCC_WORKS="x86 sparc amd64"
-# This allows for additional archs to be supported by hardened when
-# ready.
-#
-# Travis Tilley <lv@gentoo.org> (03 Sep 2004)
-#
-gcc-compiler_src_unpack() {
- # fail if using pie patches, building hardened, and glibc doesnt have
- # the necessary support
- want_pie && use hardened && glibc_have_pie
-
- if use hardened ; then
- einfo "updating configuration to build hardened GCC"
- make_gcc_hard || die "failed to make gcc hard"
- fi
-
- if is_libffi ; then
- # move the libffi target out of gcj and into all
- sed -i \
- -e '/^libgcj=/s:target-libffi::' \
- -e '/^target_lib/s:=":="target-libffi :' \
- "${S}"/configure || die
- fi
-}
guess_patch_type_in_dir() {
[[ -n $(ls "$1"/*.bz2 2>/dev/null) ]] \
&& EPATCH_SUFFIX="patch.bz2" \
@@ -944,7 +910,22 @@
do_gcc_PIE_patches
epatch_user
- ${ETYPE}_src_unpack || die "failed to ${ETYPE}_src_unpack"
+ # fail if using pie patches, building hardened, and glibc doesnt have
+ # the necessary support
+ want_pie && use hardened && glibc_have_pie
+
+ if use hardened ; then
+ einfo "updating configuration to build hardened GCC"
+ make_gcc_hard || die "failed to make gcc hard"
+ fi
+
+ if is_libffi ; then
+ # move the libffi target out of gcj and into all
+ sed -i \
+ -e '/^libgcj=/s:target-libffi::' \
+ -e '/^target_lib/s:=":="target-libffi :' \
+ "${S}"/configure || die
+ fi
# protoize don't build on FreeBSD, skip it
## removed in 4.5, bug #270558 --de.
@@ -1298,9 +1279,7 @@
--disable-werror \
--enable-secureplt"
- # etype specific configuration
- einfo "running ${ETYPE}-configure"
- ${ETYPE}-configure || die
+ gcc-compiler-configure || die
# if not specified, assume we are building for a target that only
# requires C support
@@ -1617,7 +1596,7 @@
# Do not create multiple specs files for PIE+SSP if boundschecking is in
# USE, as we disable PIE+SSP when it is.
- if [[ ${ETYPE} == "gcc-compiler" ]] && want_split_specs && ! want_minispecs; then
+ if want_split_specs && ! want_minispecs; then
split_out_specs_files || die "failed to split out specs"
fi
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-09-26 20:39 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-09-26 20:39 UTC (permalink / raw
To: gentoo-commits
vapier 11/09/26 20:39:53
Modified: toolchain.eclass
Log:
force internal jar usage by Serkan Kaba #384291
Revision Changes Path
1.471 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.471&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.471&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.470&r2=1.471
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.470
retrieving revision 1.471
diff -u -r1.470 -r1.471
--- toolchain.eclass 26 Sep 2011 17:32:44 -0000 1.470
+++ toolchain.eclass 26 Sep 2011 20:39:53 -0000 1.471
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.470 2011/09/26 17:32:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.471 2011/09/26 20:39:53 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1569,6 +1569,10 @@
einfo "CFLAGS=\"${CFLAGS}\""
einfo "CXXFLAGS=\"${CXXFLAGS}\""
+ # Force internal zip based jar script to avoid random
+ # issues with 3rd party jar implementations. #384291
+ export JAR=no
+
# For hardened gcc 4.3 piepatchset to build the hardened specs
# file (build.specs) to use when building gcc.
if ! tc_version_is_at_least 4.4 && want_minispecs ; then
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-09-27 12:14 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-09-27 12:14 UTC (permalink / raw
To: gentoo-commits
vapier 11/09/27 12:14:25
Modified: toolchain.eclass
Log:
add common depend settings
Revision Changes Path
1.472 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.472&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.472&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.471&r2=1.472
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.471
retrieving revision 1.472
diff -u -r1.471 -r1.472
--- toolchain.eclass 26 Sep 2011 20:39:53 -0000 1.471
+++ toolchain.eclass 27 Sep 2011 12:14:25 -0000 1.472
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.471 2011/09/26 20:39:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.472 2011/09/27 12:14:25 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -81,14 +81,10 @@
#---->> SLOT+IUSE logic <<----
-IUSE="multislot nptl test"
-
-if tc_version_is_at_least 3 ; then
- IUSE+=" vanilla"
-fi
+IUSE="build multislot nls nptl test vanilla"
if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then
- IUSE+=" altivec build fortran nls nocxx"
+ IUSE+=" altivec fortran nocxx"
[[ -n ${PIE_VER} ]] && IUSE+=" nopie"
[[ -n ${PP_VER} ]] && IUSE+=" nossp"
[[ -n ${SPECS_VER} ]] && IUSE+=" nossp"
@@ -121,6 +117,44 @@
fi
#----<< SLOT+IUSE logic >>----
+#---->> DEPEND <<----
+
+RDEPEND="sys-libs/zlib
+ !build? (
+ nls? ( sys-devel/gettext )
+ )"
+if tc_version_is_at_least 3 ; then
+ RDEPEND+=" virtual/libiconv"
+fi
+if tc_version_is_at_least 4 ; then
+ RDEPEND+=" >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2"
+ if tc_version_is_at_least 4.5 ; then
+ RDEPEND+=" >=dev-libs/mpc-0.8.1"
+ fi
+fi
+if has graphite ${IUSE} ; then
+ RDEPEND+="
+ graphite? (
+ >=dev-libs/cloog-ppl-0.15.10
+ >=dev-libs/ppl-0.10
+ )"
+fi
+
+DEPEND="${RDEPEND}
+ >=sys-apps/texinfo-4.8
+ >=sys-devel/bison-1.875
+ >=sys-devel/flex-2.5.4
+ test? (
+ >=dev-util/dejagnu-1.4.4
+ >=sys-devel/autogen-5.5.4
+ )"
+if tc_version_is_at_least 4.2 && has gcj ${IUSE} ; then
+ DEPEND+=" gcj? ( app-arch/zip app-arch/unzip )"
+fi
+
+PDEPEND=">=sys-devel/gcc-config-1.4"
+
+#----<< DEPEND >>----
#---->> S + SRC_URI essentials <<----
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-10-17 19:10 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-10-17 19:10 UTC (permalink / raw
To: gentoo-commits
vapier 11/10/17 19:10:58
Modified: toolchain.eclass
Log:
add a huse() helper to avoid QA warnings when checking features that are not enabled
Revision Changes Path
1.473 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.473&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.473&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.472&r2=1.473
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.472
retrieving revision 1.473
diff -u -r1.472 -r1.473
--- toolchain.eclass 27 Sep 2011 12:14:25 -0000 1.472
+++ toolchain.eclass 17 Oct 2011 19:10:58 -0000 1.473
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.472 2011/09/27 12:14:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.473 2011/10/17 19:10:58 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -765,9 +765,9 @@
unset GCC_SPECS
if use nocxx ; then
- use go && ewarn 'Go requires a C++ compiler, disabled due to USE="nocxx"'
- use objc++ && ewarn 'Obj-C++ requires a C++ compiler, disabled due to USE="nocxx"'
- use gcj && ewarn 'GCJ requires a C++ compiler, disabled due to USE="nocxx"'
+ huse go && ewarn 'Go requires a C++ compiler, disabled due to USE="nocxx"'
+ huse objc++ && ewarn 'Obj-C++ requires a C++ compiler, disabled due to USE="nocxx"'
+ huse gcj && ewarn 'GCJ requires a C++ compiler, disabled due to USE="nocxx"'
fi
want_libssp && libc_has_ssp && \
@@ -2349,6 +2349,11 @@
use multilib
}
+huse() {
+ has $1 ${IUSE} || return 1
+ use $1
+}
+
is_cxx() {
gcc-lang-supported 'c++' || return 1
! use nocxx
@@ -2356,7 +2361,7 @@
is_d() {
gcc-lang-supported d || return 1
- use d
+ huse d
}
is_f77() {
@@ -2376,27 +2381,26 @@
is_gcj() {
gcc-lang-supported java || return 1
- ! use nocxx && use gcj
+ ! use nocxx && huse gcj
}
is_go() {
gcc-lang-supported go || return 1
- ! use nocxx && use go
+ ! use nocxx && huse go
}
is_libffi() {
- has libffi ${IUSE} || return 1
- use libffi
+ huse libffi
}
is_objc() {
gcc-lang-supported objc || return 1
- use objc
+ huse objc
}
is_objcxx() {
gcc-lang-supported 'obj-c++' || return 1
- ! use nocxx && use objc++
+ ! use nocxx && huse objc++
}
is_ada() {
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-10-26 18:54 Magnus Granberg (zorry)
0 siblings, 0 replies; 266+ messages in thread
From: Magnus Granberg (zorry) @ 2011-10-26 18:54 UTC (permalink / raw
To: gentoo-commits
zorry 11/10/26 18:54:07
Modified: toolchain.eclass
Log:
Fixing the dupe of IUSE nossp
Revision Changes Path
1.474 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.474&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.474&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.473&r2=1.474
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.473
retrieving revision 1.474
diff -u -r1.473 -r1.474
--- toolchain.eclass 17 Oct 2011 19:10:58 -0000 1.473
+++ toolchain.eclass 26 Oct 2011 18:54:07 -0000 1.474
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.473 2011/10/17 19:10:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.474 2011/10/26 18:54:07 zorry Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -87,7 +87,6 @@
IUSE+=" altivec fortran nocxx"
[[ -n ${PIE_VER} ]] && IUSE+=" nopie"
[[ -n ${PP_VER} ]] && IUSE+=" nossp"
- [[ -n ${SPECS_VER} ]] && IUSE+=" nossp"
[[ -n ${HTB_VER} ]] && IUSE+=" boundschecking"
[[ -n ${D_VER} ]] && IUSE+=" d"
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-10-31 1:10 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-10-31 1:10 UTC (permalink / raw
To: gentoo-commits
vapier 11/10/31 01:10:49
Modified: toolchain.eclass
Log:
further simplify IUSE/nossp updating
Revision Changes Path
1.476 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.476&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.476&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.475&r2=1.476
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.475
retrieving revision 1.476
diff -u -r1.475 -r1.476
--- toolchain.eclass 26 Oct 2011 23:27:16 -0000 1.475
+++ toolchain.eclass 31 Oct 2011 01:10:49 -0000 1.476
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.475 2011/10/26 23:27:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.476 2011/10/31 01:10:49 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -86,9 +86,9 @@
if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then
IUSE+=" altivec fortran nocxx"
[[ -n ${PIE_VER} ]] && IUSE+=" nopie"
- [[ -n ${PP_VER} ]] && IUSE+=" nossp"
[[ -n ${HTB_VER} ]] && IUSE+=" boundschecking"
- [[ -n ${D_VER} ]] && IUSE+=" d"
+ [[ -n ${D_VER} ]] && IUSE+=" d"
+ [[ -n ${PP_VER}${SPECS_VER} ]] && IUSE+=" nossp"
if tc_version_is_at_least 3 ; then
IUSE+=" bootstrap doc gcj gtk hardened libffi multilib objc"
@@ -97,10 +97,7 @@
tc_version_is_at_least "4.1" && IUSE+=" objc++"
tc_version_is_at_least "4.2" && IUSE+=" openmp"
tc_version_is_at_least "4.3" && IUSE+=" fixed-point"
- if tc_version_is_at_least "4.4" ; then
- IUSE+=" graphite"
- [[ -n ${SPECS_VER} ]] && IUSE+=" nossp"
- fi
+ tc_version_is_at_least "4.4" && IUSE+=" graphite"
[[ ${GCC_BRANCH_VER} == 4.5 ]] && IUSE+=" lto"
tc_version_is_at_least "4.6" && IUSE+=" go"
fi
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-10-31 1:12 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-10-31 1:12 UTC (permalink / raw
To: gentoo-commits
vapier 11/10/31 01:12:33
Modified: toolchain.eclass
Log:
use tc_version_is_at_least rather than parsing GCC_BRANCH_VER for lto handling
Revision Changes Path
1.477 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.477&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.477&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.476&r2=1.477
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.476
retrieving revision 1.477
diff -u -r1.476 -r1.477
--- toolchain.eclass 31 Oct 2011 01:10:49 -0000 1.476
+++ toolchain.eclass 31 Oct 2011 01:12:33 -0000 1.477
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.476 2011/10/31 01:10:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.477 2011/10/31 01:12:33 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1290,8 +1290,11 @@
# LTO support was added in 4.5, which depends upon elfutils. This allows
# users to enable that option, and pull in the additional library. In 4.6,
# the dependency is no longer required.
- [[ ${GCC_BRANCH_VER} == 4.5 ]] && confgcc+=" $(use_enable lto)"
- [[ ${GCC_BRANCH_VER} > 4.5 ]] && confgcc+=" --enable-lto"
+ if tc_version_is_at_least "4.6" ; then
+ confgcc+=" --enable-lto"
+ elif tc_version_is_at_least "4.5" ; then
+ confgcc+=" $(use_enable lto)"
+ fi
[[ $(tc-is-softfloat) == "yes" ]] && confgcc+=" --with-float=soft"
[[ $(tc-is-hardfloat) == "yes" ]] && confgcc+=" --with-float=hard"
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-11-09 17:25 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-11-09 17:25 UTC (permalink / raw
To: gentoo-commits
vapier 11/11/09 17:25:44
Modified: toolchain.eclass
Log:
pull some more deps out of the ebuilds (gcj/fortran/mpfr), and convert a few stragglers to new in_iuse/use_if_iuse helpers
Revision Changes Path
1.478 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.478&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.478&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.477&r2=1.478
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.477
retrieving revision 1.478
diff -u -r1.477 -r1.478
--- toolchain.eclass 31 Oct 2011 01:12:33 -0000 1.477
+++ toolchain.eclass 9 Nov 2011 17:25:43 -0000 1.478
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.477 2011/10/31 01:12:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.478 2011/11/09 17:25:43 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -123,12 +123,18 @@
RDEPEND+=" virtual/libiconv"
fi
if tc_version_is_at_least 4 ; then
- RDEPEND+=" >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2"
+ GMP_MPFR_DEPS=">=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2"
+ if tc_version_is_at_least 4.3 ; then
+ RDEPEND+=" ${GMP_MPFR_DEPS}"
+ elif in_iuse fortran ; then
+ RDEPEND+=" fortran? ( ${GMP_MPFR_DEPS} )"
+ fi
if tc_version_is_at_least 4.5 ; then
RDEPEND+=" >=dev-libs/mpc-0.8.1"
fi
+ in_iuse lto && RDEPEND+=" lto? ( || ( >=dev-libs/elfutils-0.143 dev-libs/libelf ) )"
fi
-if has graphite ${IUSE} ; then
+if in_iuse graphite ; then
RDEPEND+="
graphite? (
>=dev-libs/cloog-ppl-0.15.10
@@ -144,8 +150,18 @@
>=dev-util/dejagnu-1.4.4
>=sys-devel/autogen-5.5.4
)"
-if tc_version_is_at_least 4.2 && has gcj ${IUSE} ; then
- DEPEND+=" gcj? ( app-arch/zip app-arch/unzip )"
+if in_iuse gcj ; then
+ GCJ_GTK_DEPS="
+ x11-libs/libXt
+ x11-libs/libX11
+ x11-libs/libXtst
+ x11-proto/xproto
+ x11-proto/xextproto
+ =x11-libs/gtk+-2*"
+ tc_version_is_at_least 3.4 && GCJ_GTK_DEPS+=" x11-libs/pango"
+ GCJ_DEPS=">=media-libs/libart_lgpl-2.1"
+ tc_version_is_at_least 4.2 && GCJ_DEPS+=" app-arch/zip app-arch/unzip"
+ DEPEND+=" gcj? ( gtk? ( ${GCJ_GTK_DEPS} ) ${GCJ_DEPS} )"
fi
PDEPEND=">=sys-devel/gcc-config-1.4"
@@ -1068,7 +1084,7 @@
gcc-multilib-configure
if tc_version_is_at_least "4.0" ; then
- if has mudflap ${IUSE} ; then
+ if in_iuse mudflap ; then
confgcc+=" $(use_enable mudflap libmudflap)"
else
confgcc+=" --disable-libmudflap"
@@ -1087,7 +1103,7 @@
fi
if tc_version_is_at_least "4.2" ; then
- if has openmp ${IUSE} ; then
+ if in_iuse openmp ; then
# Make sure target has pthreads support. #326757 #335883
# There shouldn't be a chicken&egg problem here as openmp won't
# build without a C library, and you can't build that w/out
@@ -2403,7 +2419,7 @@
}
is_treelang() {
- has boundschecking ${IUSE} && use boundschecking && return 1 #260532
+ use_if_iuse boundschecking && return 1 #260532
is_crosscompile && return 1 #199924
gcc-lang-supported treelang || return 1
#use treelang
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-11-14 17:40 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-11-14 17:40 UTC (permalink / raw
To: gentoo-commits
vapier 11/11/14 17:40:06
Modified: toolchain.eclass
Log:
migrate USE=nocxx to USE=cxx
Revision Changes Path
1.479 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.479&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.479&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.478&r2=1.479
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.478
retrieving revision 1.479
diff -u -r1.478 -r1.479
--- toolchain.eclass 9 Nov 2011 17:25:43 -0000 1.478
+++ toolchain.eclass 14 Nov 2011 17:40:06 -0000 1.479
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.478 2011/11/09 17:25:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.479 2011/11/14 17:40:06 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -84,7 +84,7 @@
IUSE="build multislot nls nptl test vanilla"
if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then
- IUSE+=" altivec fortran nocxx"
+ IUSE+=" altivec cxx fortran nocxx"
[[ -n ${PIE_VER} ]] && IUSE+=" nopie"
[[ -n ${HTB_VER} ]] && IUSE+=" boundschecking"
[[ -n ${D_VER} ]] && IUSE+=" d"
@@ -776,10 +776,10 @@
# we dont want to use the installed compiler's specs to build gcc!
unset GCC_SPECS
- if use nocxx ; then
- use_if_iuse go && ewarn 'Go requires a C++ compiler, disabled due to USE="nocxx"'
- use_if_iuse objc++ && ewarn 'Obj-C++ requires a C++ compiler, disabled due to USE="nocxx"'
- use_if_iuse gcj && ewarn 'GCJ requires a C++ compiler, disabled due to USE="nocxx"'
+ if ! use cxx ; then
+ use_if_iuse go && ewarn 'Go requires a C++ compiler, disabled due to USE="-cxx"'
+ use_if_iuse objc++ && ewarn 'Obj-C++ requires a C++ compiler, disabled due to USE="-cxx"'
+ use_if_iuse gcj && ewarn 'GCJ requires a C++ compiler, disabled due to USE="-cxx"'
fi
want_libssp && libc_has_ssp && \
@@ -1250,6 +1250,13 @@
gcc_do_configure() {
local confgcc
+ # Sanity check for USE=nocxx -> USE=cxx migration
+ if (use cxx && use nocxx) || (use !cxx && use !nocxx) ; then
+ eerror "We are migrating USE=nocxx to USE=cxx, but your USE settings do not make"
+ eerror "sense. Please make sure these two flags line up logically in your setup."
+ die "USE='cxx nocxx' and USE='-cxx -nocxx' make no sense"
+ fi
+
# Set configuration based on path variables
confgcc+=" \
--prefix=${PREFIX} \
@@ -1513,7 +1520,7 @@
${GCC_MAKE_TARGET} \
|| die "emake failed with ${GCC_MAKE_TARGET}"
- if ! is_crosscompile && ! use nocxx && use doc ; then
+ if ! is_crosscompile && use cxx && use doc ; then
if type -p doxygen > /dev/null ; then
if tc_version_is_at_least 4.3 ; then
cd "${CTARGET}"/libstdc++-v3/doc
@@ -2366,7 +2373,7 @@
is_cxx() {
gcc-lang-supported 'c++' || return 1
- ! use nocxx
+ use cxx
}
is_d() {
@@ -2391,12 +2398,12 @@
is_gcj() {
gcc-lang-supported java || return 1
- ! use nocxx && use_if_iuse gcj
+ use cxx && use_if_iuse gcj
}
is_go() {
gcc-lang-supported go || return 1
- ! use nocxx && use_if_iuse go
+ use cxx && use_if_iuse go
}
is_libffi() {
@@ -2410,7 +2417,7 @@
is_objcxx() {
gcc-lang-supported 'obj-c++' || return 1
- ! use nocxx && use_if_iuse objc++
+ use cxx && use_if_iuse objc++
}
is_ada() {
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-11-20 20:12 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-11-20 20:12 UTC (permalink / raw
To: gentoo-commits
vapier 11/11/20 20:12:47
Modified: toolchain.eclass
Log:
check cxx is in IUSE before trying to use it #391149 by Raúl Porcel
Revision Changes Path
1.480 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.480&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.480&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.479&r2=1.480
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.479
retrieving revision 1.480
diff -u -r1.479 -r1.480
--- toolchain.eclass 14 Nov 2011 17:40:06 -0000 1.479
+++ toolchain.eclass 20 Nov 2011 20:12:47 -0000 1.480
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.479 2011/11/14 17:40:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.480 2011/11/20 20:12:47 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -776,7 +776,7 @@
# we dont want to use the installed compiler's specs to build gcc!
unset GCC_SPECS
- if ! use cxx ; then
+ if ! is_cxx ; then
use_if_iuse go && ewarn 'Go requires a C++ compiler, disabled due to USE="-cxx"'
use_if_iuse objc++ && ewarn 'Obj-C++ requires a C++ compiler, disabled due to USE="-cxx"'
use_if_iuse gcj && ewarn 'GCJ requires a C++ compiler, disabled due to USE="-cxx"'
@@ -1251,10 +1251,12 @@
local confgcc
# Sanity check for USE=nocxx -> USE=cxx migration
- if (use cxx && use nocxx) || (use !cxx && use !nocxx) ; then
- eerror "We are migrating USE=nocxx to USE=cxx, but your USE settings do not make"
- eerror "sense. Please make sure these two flags line up logically in your setup."
- die "USE='cxx nocxx' and USE='-cxx -nocxx' make no sense"
+ if in_iuse cxx && in_iuse nocxx ; then
+ if (use cxx && use nocxx) || (use !cxx && use !nocxx) ; then
+ eerror "We are migrating USE=nocxx to USE=cxx, but your USE settings do not make"
+ eerror "sense. Please make sure these two flags line up logically in your setup."
+ die "USE='cxx nocxx' and USE='-cxx -nocxx' make no sense"
+ fi
fi
# Set configuration based on path variables
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-11-22 15:20 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-11-22 15:20 UTC (permalink / raw
To: gentoo-commits
vapier 11/11/22 15:20:48
Modified: toolchain.eclass
Log:
do not check config-lang.in in pkg_xxx funcs #391369 by Agostino Sarubbo
Revision Changes Path
1.482 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.482&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.482&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.481&r2=1.482
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.481
retrieving revision 1.482
diff -u -r1.481 -r1.482
--- toolchain.eclass 21 Nov 2011 01:43:44 -0000 1.481
+++ toolchain.eclass 22 Nov 2011 15:20:48 -0000 1.482
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.481 2011/11/21 01:43:44 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.482 2011/11/22 15:20:48 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -776,7 +776,7 @@
# we dont want to use the installed compiler's specs to build gcc!
unset GCC_SPECS
- if ! is_cxx ; then
+ if ! use_if_iuse cxx ; then
use_if_iuse go && ewarn 'Go requires a C++ compiler, disabled due to USE="-cxx"'
use_if_iuse objc++ && ewarn 'Obj-C++ requires a C++ compiler, disabled due to USE="-cxx"'
use_if_iuse gcj && ewarn 'GCJ requires a C++ compiler, disabled due to USE="-cxx"'
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-11-30 23:53 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-11-30 23:53 UTC (permalink / raw
To: gentoo-commits
vapier 11/11/30 23:53:57
Modified: toolchain.eclass
Log:
fix up python libstdc++ helpers: install the core code into the same place as the existing python code, and fix up the pretty printer movers to handle all ABIs and not just the native/32bit
Revision Changes Path
1.483 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.483&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.483&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.482&r2=1.483
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.482
retrieving revision 1.483
diff -u -r1.482 -r1.483
--- toolchain.eclass 22 Nov 2011 15:20:48 -0000 1.482
+++ toolchain.eclass 30 Nov 2011 23:53:57 -0000 1.483
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.482 2011/11/22 15:20:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.483 2011/11/30 23:53:57 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -973,6 +973,14 @@
"${S}"/configure || die
fi
+ # install the libstdc++ python into the right location
+ # http://gcc.gnu.org/PR51368
+ if tc_version_is_at_least 4.5 ; then
+ sed -i \
+ '/^pythondir =/s:=.*:= $(datadir)/python:' \
+ "${S}"/libstdc++-v3/python/Makefile.in || die
+ fi
+
# protoize don't build on FreeBSD, skip it
## removed in 4.5, bug #270558 --de.
if [[ ${GCCMAJOR}.${GCCMINOR} < 4.5 ]]; then
@@ -1126,10 +1134,10 @@
# bug #279252
#
# --with-python-dir=DIR
- # Specifies where to install the Python modules used for aot-compile. DIR
+ # Specifies where to install the Python modules used for aot-compile. DIR
# should not include the prefix used in installation. For example, if the
# Python modules are to be installed in /usr/lib/python2.5/site-packages,
- # then –with-python-dir=/lib/python2.5/site-packages should be passed.
+ # then --with-python-dir=/lib/python2.5/site-packages should be passed.
#
# This should translate into "/share/gcc-data/${CTARGET}/${GCC_CONFIG_VER}/python"
if tc_version_is_at_least "4.4" ; then
@@ -1825,16 +1833,16 @@
chown -R root:0 "${D}"${LIBPATH}
# Move pretty-printers to gdb datadir to shut ldconfig up
- gdbdir=/usr/share/gdb/auto-load${LIBPATH/\/lib\//\/$(get_libdir)\/}
- for i in "${D}"${LIBPATH}{,/32}/*-gdb.py; do
- if [[ -e ${i} ]]; then
- basedir="$(dirname ${i/${D}${LIBPATH}/})"
- sed -i -e "s:^\(libdir = \).*:\1'${LIBPATH}${basedir}':" "${i}" #348128
- insinto "${gdbdir}${basedir}"
- doins "${i}"
- rm "${i}"
- fi
+ local py gdbdir=/usr/share/gdb/auto-load${LIBPATH/\/lib\//\/$(get_libdir)\/}
+ pushd "${D}"${LIBPATH} >/dev/null
+ for py in $(find . -name '*-gdb.py') ; do
+ local multidir=${py%/*}
+ insinto "${gdbdir}/${multidir}"
+ sed -i "/^libdir =/s:=.*:= '${LIBPATH}/${multidir}':" "${py}" || die #348128
+ doins "${py}" || die
+ rm "${py}" || die
done
+ popd >/dev/null
# Don't scan .gox files for executable stacks - false positives
export QA_EXECSTACK="usr/lib*/go/*/*.gox"
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-12-02 21:03 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-12-02 21:03 UTC (permalink / raw
To: gentoo-commits
vapier 11/12/02 21:03:39
Modified: toolchain.eclass
Log:
find the C++ man page dir dynamically to handle gcc-4.3+ #273654 by David Flogeras
Revision Changes Path
1.484 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.484&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.484&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.483&r2=1.484
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.483
retrieving revision 1.484
diff -u -r1.483 -r1.484
--- toolchain.eclass 30 Nov 2011 23:53:57 -0000 1.483
+++ toolchain.eclass 2 Dec 2011 21:03:39 -0000 1.484
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.483 2011/11/30 23:53:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.484 2011/12/02 21:03:39 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1787,7 +1787,7 @@
rm -rf "${D}"/usr/share/{man,info}
rm -rf "${D}"${DATAPATH}/{man,info}
else
- local cxx_mandir=${WORKDIR}/build/${CTARGET}/libstdc++-v3/docs/doxygen/man
+ 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 {} \;
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-12-02 23:39 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-12-02 23:39 UTC (permalink / raw
To: gentoo-commits
vapier 11/12/02 23:39:03
Modified: toolchain.eclass
Log:
delete hardened code that is only used in gcc-3.x versions (as we no longer support those)
Revision Changes Path
1.485 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.485&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.485&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.484&r2=1.485
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.484
retrieving revision 1.485
diff -u -r1.484 -r1.485
--- toolchain.eclass 2 Dec 2011 21:03:39 -0000 1.484
+++ toolchain.eclass 2 Dec 2011 23:39:03 -0000 1.485
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.484 2011/12/02 21:03:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.485 2011/12/02 23:39:03 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -498,11 +498,6 @@
}
want_ssp() { _want_stuff PP_VER !nossp ; }
-# SPLIT_SPECS are deprecated for >=GCC 4.4
-want_split_specs() {
- tc_version_is_at_least 4.4 && return 1
- [[ ${SPLIT_SPECS} == "true" ]] && want_pie
-}
want_minispecs() {
if tc_version_is_at_least 4.3.2 && use hardened ; then
if ! want_pie ; then
@@ -611,52 +606,6 @@
BRANDING_GCC_PKGVERSION=${BRANDING_GCC_PKGVERSION/Gentoo/Gentoo Hardened}
}
-# now we generate different spec files so that the user can select a compiler
-# that enforces certain features in gcc itself and so we don't have to worry
-# about a certain package ignoring CFLAGS/LDFLAGS
-_create_specs_file() {
- # Usage: _create_specs_file <USE flag> <specs name> <CFLAGS>
- local uflag=$1 name=$2 flags=${*:3}
- ebegin "Creating a ${name} gcc specs file"
- pushd "${WORKDIR}"/build/gcc > /dev/null
- if [[ -z ${uflag} ]] || use ${uflag} ; then
- # backup the compiler first
- cp Makefile Makefile.orig
- sed -i -e '/^HARD_CFLAGS/s:=.*:='"${flags}"':' Makefile
- mv xgcc xgcc.foo
- mv gcc.o gcc.o.foo
- emake -s xgcc
- $(XGCC) -dumpspecs > "${WORKDIR}"/build/${name}.specs
- # restore everything to normal
- mv gcc.o.foo gcc.o
- mv xgcc.foo xgcc
- mv Makefile.orig Makefile
- else
- $(XGCC) -dumpspecs > "${WORKDIR}"/build/${name}.specs
- fi
- popd > /dev/null
- eend $([[ -s ${WORKDIR}/build/${name}.specs ]] ; echo $?)
-}
-create_vanilla_specs_file() { _create_specs_file hardened vanilla ; }
-create_hardened_specs_file() { _create_specs_file !hardened hardened ${gcc_common_hard} -DEFAULT_PIE_SSP ; }
-create_hardenednossp_specs_file() { _create_specs_file "" hardenednossp ${gcc_common_hard} -DEFAULT_PIE ; }
-create_hardenednopie_specs_file() { _create_specs_file "" hardenednopie ${gcc_common_hard} -DEFAULT_SSP ; }
-create_hardenednopiessp_specs_file() { _create_specs_file "" hardenednopiessp ${gcc_common_hard} ; }
-
-split_out_specs_files() {
- local s spec_list="hardenednopiessp vanilla"
- if hardened_gcc_works ; then
- spec_list="${spec_list} hardened hardenednossp hardenednopie"
- elif hardened_gcc_works pie ; then
- spec_list="${spec_list} hardenednossp"
- elif hardened_gcc_works ssp ; then
- spec_list="${spec_list} hardenednopie"
- fi
- for s in ${spec_list} ; do
- create_${s}_specs_file || return 1
- done
-}
-
create_gcc_env_entry() {
dodir /etc/env.d/gcc
local gcc_envd_base="/etc/env.d/gcc/${CTARGET}-${GCC_CONFIG_VER}"
@@ -1664,12 +1613,6 @@
einfo "Compiling ${PN} ..."
gcc_do_make ${GCC_MAKE_TARGET}
- # Do not create multiple specs files for PIE+SSP if boundschecking is in
- # USE, as we disable PIE+SSP when it is.
- if want_split_specs && ! want_minispecs; then
- split_out_specs_files || die "failed to split out specs"
- fi
-
popd > /dev/null
}
@@ -1711,22 +1654,6 @@
dodir /etc/env.d/gcc
create_gcc_env_entry
- if want_split_specs ; then
- if use hardened ; then
- create_gcc_env_entry vanilla
- fi
- ! use hardened && hardened_gcc_works && create_gcc_env_entry hardened
- if hardened_gcc_works || hardened_gcc_works pie ; then
- create_gcc_env_entry hardenednossp
- fi
- if hardened_gcc_works || hardened_gcc_works ssp ; then
- create_gcc_env_entry hardenednopie
- fi
- create_gcc_env_entry hardenednopiessp
-
- insinto ${LIBPATH}
- doins "${WORKDIR}"/build/*.specs || die "failed to install specs"
- fi
# Setup the gcc_env_entry for hardened gcc 4 with minispecs
if want_minispecs ; then
copy_minispecs_gcc_specs
@@ -2021,12 +1948,6 @@
#
# GENTOO_PATCH_EXCLUDE
# List of filenames, relative to ${WORKDIR}/patch/
-#
-# PIEPATCH_EXCLUDE
-# List of filenames, relative to ${WORKDIR}/piepatch/
-#
-# Travis Tilley <lv@gentoo.org> (03 Sep 2004)
-#
exclude_gcc_patches() {
local i
for i in ${GENTOO_PATCH_EXCLUDE} ; do
@@ -2035,12 +1956,6 @@
rm -f "${WORKDIR}"/patch/${i} || die "failed to delete ${i}"
fi
done
- for i in ${PIEPATCH_EXCLUDE} ; do
- if [[ -f ${WORKDIR}/piepatch/${i} ]] ; then
- einfo "Excluding piepatch ${i}"
- rm -f "${WORKDIR}"/piepatch/${i} || die "failed to delete ${i}"
- fi
- done
}
# Try to apply some stub patches so that gcc won't error out when
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-12-03 1:04 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-12-03 1:04 UTC (permalink / raw
To: gentoo-commits
vapier 11/12/03 01:04:35
Modified: toolchain.eclass
Log:
drop protoize/unprotoize altogether since upstream has deprecated it
Revision Changes Path
1.486 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.486&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.486&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.485&r2=1.486
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.485
retrieving revision 1.486
diff -u -r1.485 -r1.486
--- toolchain.eclass 2 Dec 2011 23:39:03 -0000 1.485
+++ toolchain.eclass 3 Dec 2011 01:04:35 -0000 1.486
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.485 2011/12/02 23:39:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.486 2011/12/03 01:04:35 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -930,15 +930,6 @@
"${S}"/libstdc++-v3/python/Makefile.in || die
fi
- # protoize don't build on FreeBSD, skip it
- ## removed in 4.5, bug #270558 --de.
- if [[ ${GCCMAJOR}.${GCCMINOR} < 4.5 ]]; then
- if ! is_crosscompile && ! use elibc_FreeBSD ; then
- # enable protoize / unprotoize
- sed -i -e '/^LANGUAGES =/s:$: proto:' "${S}"/gcc/Makefile.in
- fi
- fi
-
# No idea when this first started being fixed, but let's go with 4.3.x for now
if ! tc_version_is_at_least 4.3 ; then
fix_files=""
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-12-03 2:06 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-12-03 2:06 UTC (permalink / raw
To: gentoo-commits
vapier 11/12/03 02:06:31
Modified: toolchain.eclass
Log:
convert GCCMAJOR/GCCMINOR checking to tc_version_is_at_least when possible
Revision Changes Path
1.487 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.487&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.487&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.486&r2=1.487
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.486
retrieving revision 1.487
diff -u -r1.486 -r1.487
--- toolchain.eclass 3 Dec 2011 01:04:35 -0000 1.486
+++ toolchain.eclass 3 Dec 2011 02:06:31 -0000 1.487
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.486 2011/12/03 01:04:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.487 2011/12/03 02:06:31 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -942,14 +942,14 @@
setup_multilib_osdirnames
gcc_version_patch
- if [[ ${GCCMAJOR}.${GCCMINOR} > 4.0 ]] ; then
+ if tc_version_is_at_least 4.1 ; then
if [[ -n ${SNAPSHOT} || -n ${PRERELEASE} || -n ${GCC_SVN} ]] ; then
echo ${PV/_/-} > "${S}"/gcc/BASE-VER
fi
fi
# >= gcc-4.3 doesn't bundle ecj.jar, so copy it
- if [[ ${GCCMAJOR}.${GCCMINOR} > 4.2 ]] && use gcj ; then
+ if tc_version_is_at_least 4.3 && use gcj ; then
if tc_version_is_at_least "4.5" ; then
einfo "Copying ecj-4.5.jar"
cp -pPR "${DISTDIR}/ecj-4.5.jar" "${S}/ecj.jar" || die
@@ -968,9 +968,7 @@
# In gcc 3.3.x and 3.4.x, rename the java bins to gcc-specific names
# in line with gcc-4.
- if [[ ${GCCMAJOR} == 3 ]] &&
- [[ ${GCCMINOR} -ge 3 ]]
- then
+ if tc_version_is_at_least 3.3 && ! tc_version_is_at_least 4.0 ; then
do_gcc_rename_java_bins
fi
@@ -1318,9 +1316,7 @@
fi
fi
- if [[ ${GCCMAJOR}.${GCCMINOR} > 4.1 ]] ; then
- confgcc+=" --disable-bootstrap"
- fi
+ tc_version_is_at_least 4.2 && confgcc+=" --disable-bootstrap"
else
if tc-is-static-only ; then
confgcc+=" --disable-shared"
@@ -1340,7 +1336,7 @@
*-uclibc*)
confgcc+=" --disable-__cxa_atexit --enable-target-optspace $(use_enable nptl tls)"
[[ ${GCCMAJOR}.${GCCMINOR} == 3.3 ]] && confgcc+=" --enable-sjlj-exceptions"
- if tc_version_is_at_least 3.4 && [[ ${GCCMAJOR}.${GCCMINOR} < 4.3 ]] ; then
+ if tc_version_is_at_least 3.4 && ! tc_version_is_at_least 4.3 ; then
confgcc+=" --enable-clocale=uclibc"
fi
;;
@@ -1358,13 +1354,13 @@
confgcc+=" --enable-__cxa_atexit"
;;
esac
- [[ ${GCCMAJOR}.${GCCMINOR} < 3.4 ]] && confgcc+=" --disable-libunwind-exceptions"
+ tc_version_is_at_least 3.4 || confgcc+=" --disable-libunwind-exceptions"
# create a sparc*linux*-{gcc,g++} that can handle -m32 and -m64 (biarch)
if [[ ${CTARGET} == sparc*linux* ]] \
&& is_multilib \
&& ! is_crosscompile \
- && [[ ${GCCMAJOR}.${GCCMINOR} > 4.2 ]]
+ && tc_version_is_at_least 4.3
then
confgcc+=" --enable-targets=all"
fi
@@ -2283,7 +2279,7 @@
}
is_multilib() {
- [[ ${GCCMAJOR} < 3 ]] && return 1
+ tc_version_is_at_least 3 || return 1
use multilib
}
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-12-03 20:43 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-12-03 20:43 UTC (permalink / raw
To: gentoo-commits
vapier 11/12/03 20:43:51
Modified: toolchain.eclass
Log:
delete unused HTB_EXCLUSIVE variable, and drop old do_gcc_stub logic which is used only with <gcc-4.1
Revision Changes Path
1.488 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.488&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.488&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.487&r2=1.488
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.487
retrieving revision 1.488
diff -u -r1.487 -r1.488
--- toolchain.eclass 3 Dec 2011 02:06:31 -0000 1.487
+++ toolchain.eclass 3 Dec 2011 20:43:51 -0000 1.488
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.487 2011/12/03 02:06:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.488 2011/12/03 20:43:51 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1945,27 +1945,8 @@
done
}
-# Try to apply some stub patches so that gcc won't error out when
-# passed parameters like -fstack-protector but no ssp is found
-do_gcc_stub() {
- local v stub_patch=""
- for v in ${GCC_RELEASE_VER} ${GCC_BRANCH_VER} ; do
- stub_patch=${GCC_FILESDIR}/stubs/gcc-${v}-$1-stub.patch
- if [[ -e ${stub_patch} ]] && ! use vanilla ; then
- EPATCH_SINGLE_MSG="Applying stub patch for $1 ..." \
- epatch "${stub_patch}"
- return 0
- fi
- done
-}
-
do_gcc_HTB_patches() {
- if ! want_boundschecking || \
- (want_ssp && [[ ${HTB_EXCLUSIVE} == "true" ]])
- then
- do_gcc_stub htb
- return 0
- fi
+ want_boundschecking || return 0
# modify the bounds checking patch with a regression patch
epatch "${WORKDIR}/bounds-checking-gcc-${HTB_GCC_VER}-${HTB_VER}.patch"
@@ -1975,11 +1956,7 @@
# patch in ProPolice Stack Smashing protection
do_gcc_SSP_patches() {
# PARISC has no love ... it's our stack :(
- if [[ $(tc-arch) == "hppa" ]] || \
- ! want_ssp || \
- (want_boundschecking && [[ ${HTB_EXCLUSIVE} == "true" ]])
- then
- do_gcc_stub ssp
+ if [[ $(tc-arch) == "hppa" ]] || ! want_ssp ; then
return 0
fi
@@ -2062,11 +2039,7 @@
# do various updates to PIE logic
do_gcc_PIE_patches() {
- if ! want_pie || \
- (want_boundschecking && [[ ${HTB_EXCLUSIVE} == "true" ]])
- then
- return 0
- fi
+ want_pie || return 0
want_boundschecking \
&& rm -f "${WORKDIR}"/piepatch/*/*-boundschecking-no.patch* \
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-12-03 20:45 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-12-03 20:45 UTC (permalink / raw
To: gentoo-commits
vapier 11/12/03 20:45:45
Modified: toolchain.eclass
Log:
drop now unused exclude_gcc_patches/GENTOO_PATCH_EXCLUDE logic
Revision Changes Path
1.489 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.489&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.489&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.488&r2=1.489
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.488
retrieving revision 1.489
diff -u -r1.488 -r1.489
--- toolchain.eclass 3 Dec 2011 20:43:51 -0000 1.488
+++ toolchain.eclass 3 Dec 2011 20:45:45 -0000 1.489
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.488 2011/12/03 20:43:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.489 2011/12/03 20:45:45 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -883,7 +883,6 @@
[[ -z ${UCLIBC_VER} ]] && [[ ${CTARGET} == *-uclibc* ]] && die "Sorry, this version does not support uClibc"
[[ -z ${GCC_SVN} ]] && gcc_quick_unpack
- exclude_gcc_patches
cd "${S}"
@@ -1931,20 +1930,6 @@
popd > /dev/null
}
-# Exclude any unwanted patches, as specified by the following variables:
-#
-# GENTOO_PATCH_EXCLUDE
-# List of filenames, relative to ${WORKDIR}/patch/
-exclude_gcc_patches() {
- local i
- for i in ${GENTOO_PATCH_EXCLUDE} ; do
- if [[ -f ${WORKDIR}/patch/${i} ]] ; then
- einfo "Excluding patch ${i}"
- rm -f "${WORKDIR}"/patch/${i} || die "failed to delete ${i}"
- fi
- done
-}
-
do_gcc_HTB_patches() {
want_boundschecking || return 0
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-12-04 19:24 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-12-04 19:24 UTC (permalink / raw
To: gentoo-commits
vapier 11/12/04 19:24:04
Modified: toolchain.eclass
Log:
drop old glibc pie checking as this has worked since at least version 2.4
Revision Changes Path
1.490 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.490&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.490&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.489&r2=1.490
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.489
retrieving revision 1.490
diff -u -r1.489 -r1.490
--- toolchain.eclass 3 Dec 2011 20:45:45 -0000 1.489
+++ toolchain.eclass 4 Dec 2011 19:24:04 -0000 1.490
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.489 2011/12/03 20:45:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.490 2011/12/04 19:24:04 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -516,17 +516,6 @@
fi
return 1
}
-# This function checks whether or not glibc has the support required to build
-# Position Independant Executables with gcc.
-glibc_have_pie() {
- if [[ ! -f ${ROOT}/usr/$(get_libdir)/Scrt1.o ]] ; then
- echo
- ewarn "Your glibc does not have support for pie, the file Scrt1.o is missing"
- ewarn "Please update your glibc to a proper version or disable hardened"
- echo
- return 1
- fi
-}
# This function determines whether or not libc has been patched with stack
# smashing protection support.
@@ -904,10 +893,6 @@
do_gcc_PIE_patches
epatch_user
- # fail if using pie patches, building hardened, and glibc doesnt have
- # the necessary support
- want_pie && use hardened && glibc_have_pie
-
if use hardened ; then
einfo "updating configuration to build hardened GCC"
make_gcc_hard || die "failed to make gcc hard"
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-12-04 22:23 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-12-04 22:23 UTC (permalink / raw
To: gentoo-commits
vapier 11/12/04 22:23:15
Modified: toolchain.eclass
Log:
relocate logging.properties from libgcj to avoid SLOT collisions #390713 by Martin von Gagern
Revision Changes Path
1.491 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.491&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.491&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.490&r2=1.491
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.490
retrieving revision 1.491
diff -u -r1.490 -r1.491
--- toolchain.eclass 4 Dec 2011 19:24:04 -0000 1.490
+++ toolchain.eclass 4 Dec 2011 22:23:15 -0000 1.491
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.490 2011/12/04 19:24:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.491 2011/12/04 22:23:15 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1768,16 +1768,18 @@
rm -rf "${D}"${PREFIX}/lib*/security
fi
- # Move libgcj.spec to compiler-specific directories
- [[ -f ${D}${PREFIX}/lib/libgcj.spec ]] && \
- mv -f "${D}"${PREFIX}/lib/libgcj.spec "${D}"${LIBPATH}/libgcj.spec
-
- # SLOT up libgcj.pc (and let gcc-config worry about links)
- local libgcj=$(find "${D}"${PREFIX}/lib/pkgconfig/ -name 'libgcj*.pc')
- if [[ -n ${libgcj} ]] ; then
- sed -i "/^libdir=/s:=.*:=${LIBPATH}:" "${libgcj}"
- mv "${libgcj}" "${D}"/usr/lib/pkgconfig/libgcj-${GCC_PV}.pc || die
- fi
+ # Move random gcj files to compiler-specific directories
+ for x in libgcj.spec logging.properties ; do
+ x="${D}${PREFIX}/lib/${x}"
+ [[ -f ${x} ]] && mv -f "${x}" "${D}"${LIBPATH}/
+ done
+
+ # SLOT up libgcj.pc if it's available (and let gcc-config worry about links)
+ for x in "${D}"${PREFIX}/lib*/pkgconfig/libgcj*.pc ; do
+ [[ -f ${x} ]] || continue
+ sed -i "/^libdir=/s:=.*:=${LIBPATH}:" "${x}"
+ mv "${x}" "${D}"/usr/lib/pkgconfig/libgcj-${GCC_PV}.pc || die
+ done
# Rename jar because it could clash with Kaffe's jar if this gcc is
# primary compiler (aka don't have the -<version> extension)
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-12-04 22:55 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-12-04 22:55 UTC (permalink / raw
To: gentoo-commits
vapier 11/12/04 22:55:00
Modified: toolchain.eclass
Log:
simplify libjava multilib hack a bit
Revision Changes Path
1.492 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.492&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.492&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.491&r2=1.492
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.491
retrieving revision 1.492
diff -u -r1.491 -r1.492
--- toolchain.eclass 4 Dec 2011 22:23:15 -0000 1.491
+++ toolchain.eclass 4 Dec 2011 22:54:59 -0000 1.492
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.491 2011/12/04 22:23:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.492 2011/12/04 22:54:59 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -2187,17 +2187,15 @@
}
disable_multilib_libjava() {
- if is_gcj ; then
- # We dont want a multilib libjava, so lets use this hack taken from fedora
- pushd "${S}" > /dev/null
- sed -i -e 's/^all: all-redirect/ifeq (\$(MULTISUBDIR),)\nall: all-redirect\nelse\nall:\n\techo Multilib libjava build disabled\nendif/' libjava/Makefile.in
- sed -i -e 's/^install: install-redirect/ifeq (\$(MULTISUBDIR),)\ninstall: install-redirect\nelse\ninstall:\n\techo Multilib libjava install disabled\nendif/' libjava/Makefile.in
- sed -i -e 's/^check: check-redirect/ifeq (\$(MULTISUBDIR),)\ncheck: check-redirect\nelse\ncheck:\n\techo Multilib libjava check disabled\nendif/' libjava/Makefile.in
- sed -i -e 's/^all: all-recursive/ifeq (\$(MULTISUBDIR),)\nall: all-recursive\nelse\nall:\n\techo Multilib libjava build disabled\nendif/' libjava/Makefile.in
- sed -i -e 's/^install: install-recursive/ifeq (\$(MULTISUBDIR),)\ninstall: install-recursive\nelse\ninstall:\n\techo Multilib libjava install disabled\nendif/' libjava/Makefile.in
- sed -i -e 's/^check: check-recursive/ifeq (\$(MULTISUBDIR),)\ncheck: check-recursive\nelse\ncheck:\n\techo Multilib libjava check disabled\nendif/' libjava/Makefile.in
- popd > /dev/null
- fi
+ # We dont want a multilib libjava, so lets use this hack taken from fedora
+ sed -i -r \
+ -e 's/^((all:) all-redirect)/ifeq (\$(MULTISUBDIR),)\n\1\nelse\n\2\n\techo Multilib libjava disabled\nendif/' \
+ -e 's/^((install:) install-redirect)/ifeq (\$(MULTISUBDIR),)\n\1\nelse\n\2\n\techo Multilib libjava disabled\nendif/' \
+ -e 's/^((check:) check-redirect)/ifeq (\$(MULTISUBDIR),)\n\1\nelse\n\2\n\techo Multilib libjava disabled\nendif/' \
+ -e 's/^((all:) all-recursive)/ifeq (\$(MULTISUBDIR),)\n\1\nelse\n\2\n\techo Multilib libjava disabled\nendif/' \
+ -e 's/^((install:) install-recursive)/ifeq (\$(MULTISUBDIR),)\n\1\nelse\n\2\n\techo Multilib libjava disabled\nendif/' \
+ -e 's/^((check:) check-recursive)/ifeq (\$(MULTISUBDIR),)\n\1\nelse\n\2\n\techo Multilib libjava disabled\nendif/' \
+ "${S}"/libjava/Makefile.in || die
}
# make sure the libtool archives have libdir set to where they actually
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-12-04 22:59 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-12-04 22:59 UTC (permalink / raw
To: gentoo-commits
vapier 11/12/04 22:59:31
Modified: toolchain.eclass
Log:
no one uses MAN_VER anymore, so just drop it
Revision Changes Path
1.493 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.493&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.493&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.492&r2=1.493
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.492
retrieving revision 1.493
diff -u -r1.492 -r1.493
--- toolchain.eclass 4 Dec 2011 22:54:59 -0000 1.492
+++ toolchain.eclass 4 Dec 2011 22:59:31 -0000 1.493
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.492 2011/12/04 22:54:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.493 2011/12/04 22:59:31 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -265,14 +265,6 @@
# for an older gcc version with a new gcc, make sure you set
# HTB_GCC_VER to that version of gcc.
#
-# MAN_VER
-# The version of gcc for which we will download manpages. This will
-# default to ${GCC_RELEASE_VER}, but we may not want to pre-generate man pages
-# for prerelease test ebuilds for example. This allows you to
-# continue using pre-generated manpages from the last stable release.
-# If set to "none", this will prevent the downloading of manpages,
-# which is useful for individual library targets.
-#
gentoo_urls() {
local devspace="HTTP~lv/GCC/URI HTTP~eradicator/gcc/URI HTTP~vapier/dist/URI
HTTP~halcy0n/patches/URI HTTP~zorry/patches/gcc/URI HTTP~dirtyepic/dist/URI"
@@ -317,11 +309,6 @@
[[ -n ${UCLIBC_VER} ]] && \
GCC_SRC_URI="${GCC_SRC_URI} $(gentoo_urls gcc-${UCLIBC_GCC_VER}-uclibc-patches-${UCLIBC_VER}.tar.bz2)"
- # PERL cannot be present at bootstrap, and is used to build the man pages.
- # So... lets include some pre-generated ones, shall we?
- [[ -n ${MAN_VER} ]] && \
- GCC_SRC_URI="${GCC_SRC_URI} $(gentoo_urls gcc-${MAN_VER}-manpages.tar.bz2)"
-
# various gentoo patches
[[ -n ${PATCH_VER} ]] && \
GCC_SRC_URI="${GCC_SRC_URI} $(gentoo_urls gcc-${PATCH_GCC_VER}-patches-${PATCH_VER}.tar.bz2)"
@@ -1568,10 +1555,6 @@
mkdir -p "${WORKDIR}"/build
pushd "${WORKDIR}"/build > /dev/null
- # Install our pre generated manpages if we do not have perl ...
- [[ ! -x /usr/bin/perl ]] && [[ -n ${MAN_VER} ]] && \
- unpack gcc-${MAN_VER}-manpages.tar.bz2
-
einfo "Configuring ${PN} ..."
gcc_do_configure
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-12-06 4:07 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-12-06 4:07 UTC (permalink / raw
To: gentoo-commits
vapier 11/12/06 04:07:16
Modified: toolchain.eclass
Log:
Drop obsolete/unsupported SSP/PIE code in older gcc versions (pre gcc-4)
Revision Changes Path
1.494 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.494&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.494&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.493&r2=1.494
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.493
retrieving revision 1.494
diff -u -r1.493 -r1.494
--- toolchain.eclass 4 Dec 2011 22:59:31 -0000 1.493
+++ toolchain.eclass 6 Dec 2011 04:07:16 -0000 1.494
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.493 2011/12/04 22:59:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.494 2011/12/06 04:07:16 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -88,7 +88,7 @@
[[ -n ${PIE_VER} ]] && IUSE+=" nopie"
[[ -n ${HTB_VER} ]] && IUSE+=" boundschecking"
[[ -n ${D_VER} ]] && IUSE+=" d"
- [[ -n ${PP_VER}${SPECS_VER} ]] && IUSE+=" nossp"
+ [[ -n ${SPECS_VER} ]] && IUSE+=" nossp"
if tc_version_is_at_least 3 ; then
IUSE+=" bootstrap doc gcj gtk hardened libffi multilib objc"
@@ -216,18 +216,15 @@
#
# PIE_VER
# PIE_GCC_VER
-# obsoleted: PIE_CORE
# These variables control patching in various updates for the logic
# controlling Position Independant Executables. PIE_VER is expected
-# to be the version of this patch, PIE_GCC_VER the gcc version of
-# the patch, and PIE_CORE (obsoleted) the actual filename of the patch.
+# to be the version of this patch, and PIE_GCC_VER the gcc version of
+# the patch:
# An example:
# PIE_VER="8.7.6.5"
# PIE_GCC_VER="3.4.0"
# The resulting filename of this tarball will be:
# gcc-${PIE_GCC_VER:-${GCC_RELEASE_VER}}-piepatches-v${PIE_VER}.tar.bz2
-# old syntax (do not define PIE_CORE anymore):
-# PIE_CORE="gcc-3.4.0-piepatches-v${PIE_VER}.tar.bz2"
#
# SPECS_VER
# SPECS_GCC_VER
@@ -241,23 +238,6 @@
# The resulting filename of this tarball will be:
# gcc-${SPECS_GCC_VER:-${GCC_RELEASE_VER}}-specs-${SPECS_VER}.tar.bz2
#
-# PP_VER
-# PP_GCC_VER
-# obsoleted: PP_FVER
-# These variables control patching in stack smashing protection
-# support. They both control the version of ProPolice to download.
-#
-# PP_VER / PP_GCC_VER
-# Used to roll our own custom tarballs of ssp.
-# PP_FVER / PP_VER
-# Used for mirroring ssp straight from IBM.
-# PP_VER sets the version of the directory in which to find the
-# patch, and PP_FVER sets the version of the patch itself. For
-# example:
-# PP_VER="3_4"
-# PP_FVER="${PP_VER//_/.}-2"
-# would download gcc3_4/protector-3.4-2.tar.gz
-#
# HTB_VER
# HTB_GCC_VER
# These variables control whether or not an ebuild supports Herman
@@ -275,7 +255,6 @@
export PATCH_GCC_VER=${PATCH_GCC_VER:-${GCC_RELEASE_VER}}
export UCLIBC_GCC_VER=${UCLIBC_GCC_VER:-${PATCH_GCC_VER}}
export PIE_GCC_VER=${PIE_GCC_VER:-${GCC_RELEASE_VER}}
- export PP_GCC_VER=${PP_GCC_VER:-${GCC_RELEASE_VER}}
export HTB_GCC_VER=${HTB_GCC_VER:-${GCC_RELEASE_VER}}
export SPECS_GCC_VER=${SPECS_GCC_VER:-${GCC_RELEASE_VER}}
@@ -292,19 +271,6 @@
GCC_SRC_URI="${GCC_SRC_URI} $(gentoo_urls gcc-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2)"
fi
- # propolice aka stack smashing protection
- if [[ -n ${PP_VER} ]] ; then
- if [[ -n ${PP_FVER} ]] ; then
- GCC_SRC_URI="${GCC_SRC_URI}
- !nossp? (
- http://www.research.ibm.com/trl/projects/security/ssp/gcc${PP_VER}/protector-${PP_FVER}.tar.gz
- $(gentoo_urls protector-${PP_FVER}.tar.gz)
- )"
- else
- GCC_SRC_URI="${GCC_SRC_URI} $(gentoo_urls gcc-${PP_GCC_VER}-ssp-${PP_VER}.tar.bz2)"
- fi
- fi
-
# uclibc lovin
[[ -n ${UCLIBC_VER} ]] && \
GCC_SRC_URI="${GCC_SRC_URI} $(gentoo_urls gcc-${UCLIBC_GCC_VER}-uclibc-patches-${UCLIBC_VER}.tar.bz2)"
@@ -386,7 +352,7 @@
fi
return 1
elif [[ $1 == "ssp" ]] ; then
- [[ -n ${PP_VER} ]] || [[ -n ${SPECS_VER} ]] || return 1
+ [[ -n ${SPECS_VER} ]] || return 1
tc_version_is_at_least 4.3.2 && use nossp && return 1
hardened_gcc_is_stable ssp && return 0
if has "~$(tc-arch)" ${ACCEPT_KEYWORDS} ; then
@@ -483,7 +449,6 @@
tc_version_is_at_least 4.3.2 && return 1
_want_stuff PIE_VER !nopie
}
-want_ssp() { _want_stuff PP_VER !nossp ; }
want_minispecs() {
if tc_version_is_at_least 4.3.2 && use hardened ; then
@@ -876,7 +841,6 @@
fi
fi
do_gcc_HTB_patches
- do_gcc_SSP_patches
do_gcc_PIE_patches
epatch_user
@@ -1832,7 +1796,6 @@
export PATCH_GCC_VER=${PATCH_GCC_VER:-${GCC_RELEASE_VER}}
export UCLIBC_GCC_VER=${UCLIBC_GCC_VER:-${PATCH_GCC_VER}}
export PIE_GCC_VER=${PIE_GCC_VER:-${GCC_RELEASE_VER}}
- export PP_GCC_VER=${PP_GCC_VER:-${GCC_RELEASE_VER}}
export HTB_GCC_VER=${HTB_GCC_VER:-${GCC_RELEASE_VER}}
export SPECS_GCC_VER=${SPECS_GCC_VER:-${GCC_RELEASE_VER}}
@@ -1873,17 +1836,6 @@
[[ -n ${UCLIBC_VER} ]] && \
unpack gcc-${UCLIBC_GCC_VER}-uclibc-patches-${UCLIBC_VER}.tar.bz2
- if want_ssp ; then
- if [[ -n ${PP_FVER} ]] ; then
- # The gcc 3.4 propolice versions are meant to be unpacked to ${S}
- pushd "${S}" > /dev/null
- unpack protector-${PP_FVER}.tar.gz
- popd > /dev/null
- else
- unpack gcc-${PP_GCC_VER}-ssp-${PP_VER}.tar.bz2
- fi
- fi
-
if want_pie ; then
if [[ -n ${PIE_CORE} ]] ; then
unpack ${PIE_CORE}
@@ -1908,90 +1860,6 @@
BRANDING_GCC_PKGVERSION="${BRANDING_GCC_PKGVERSION}, HTB-${HTB_GCC_VER}-${HTB_VER}"
}
-# patch in ProPolice Stack Smashing protection
-do_gcc_SSP_patches() {
- # PARISC has no love ... it's our stack :(
- if [[ $(tc-arch) == "hppa" ]] || ! want_ssp ; then
- return 0
- fi
-
- local ssppatch
- local sspdocs
-
- if [[ -n ${PP_FVER} ]] ; then
- # Etoh keeps changing where files are and what the patch is named
- if tc_version_is_at_least 3.4.1 ; then
- # >3.4.1 uses version in patch name, and also includes docs
- ssppatch="${S}/gcc_${PP_VER}.dif"
- sspdocs="yes"
- elif tc_version_is_at_least 3.4.0 ; then
- # >3.4 put files where they belong and 3_4 uses old patch name
- ssppatch="${S}/protector.dif"
- sspdocs="no"
- elif tc_version_is_at_least 3.2.3 ; then
- # earlier versions have no directory structure or docs
- mv "${S}"/protector.{c,h} "${S}"/gcc
- ssppatch="${S}/protector.dif"
- sspdocs="no"
- fi
- else
- # Just start packaging the damn thing ourselves
- mv "${WORKDIR}"/ssp/protector.{c,h} "${S}"/gcc/
- ssppatch=${WORKDIR}/ssp/gcc-${PP_GCC_VER}-ssp.patch
- # allow boundschecking and ssp to get along
- (want_boundschecking && [[ -e ${WORKDIR}/ssp/htb-ssp.patch ]]) \
- && patch -s "${ssppatch}" "${WORKDIR}"/ssp/htb-ssp.patch
- fi
-
- [[ -z ${ssppatch} ]] && die "Sorry, SSP is not supported in this version"
- epatch ${ssppatch}
-
- if [[ ${PN} == "gcc" && ${sspdocs} == "no" ]] ; then
- epatch "${GCC_FILESDIR}"/pro-police-docs.patch
- fi
-
- # Don't build crtbegin/end with ssp
- sed -e 's|^CRTSTUFF_CFLAGS = |CRTSTUFF_CFLAGS = -fno-stack-protector |'\
- -i gcc/Makefile.in || die "Failed to update crtstuff!"
-
- # if gcc in a stage3 defaults to ssp, is version 3.4.0 and a stage1 is built
- # the build fails building timevar.o w/:
- # cc1: stack smashing attack in function ix86_split_to_parts()
- if use build && tc_version_is_at_least 3.4.0 ; then
- if gcc -dumpspecs | grep -q "fno-stack-protector:" ; then
- epatch "${GCC_FILESDIR}"/3.4.0/gcc-3.4.0-cc1-no-stack-protector.patch
- fi
- fi
-
- BRANDING_GCC_PKGVERSION="${BRANDING_GCC_PKGVERSION}, ssp-${PP_FVER:-${PP_GCC_VER}-${PP_VER}}"
- if want_libssp ; then
- update_gcc_for_libssp
- else
- update_gcc_for_libc_ssp
- fi
-
- # Don't build libgcc with ssp
- sed -e 's|^\(LIBGCC2_CFLAGS.*\)$|\1 -fno-stack-protector|' \
- -i gcc/Makefile.in || die "Failed to update gcc!"
-}
-
-# If glibc or uclibc has been patched to provide the necessary symbols itself,
-# then lets use those for SSP instead of libgcc.
-update_gcc_for_libc_ssp() {
- if libc_has_ssp ; then
- einfo "Updating gcc to use SSP from libc ..."
- sed -e 's|^\(LIBGCC2_CFLAGS.*\)$|\1 -D_LIBC_PROVIDES_SSP_|' \
- -i "${S}"/gcc/Makefile.in || die "Failed to update gcc!"
- fi
-}
-
-# a split out non-libc non-libgcc ssp requires additional spec logic changes
-update_gcc_for_libssp() {
- einfo "Updating gcc to use SSP from libssp..."
- sed -e 's|^\(INTERNAL_CFLAGS.*\)$|\1 -D_LIBSSP_PROVIDES_SSP_|' \
- -i "${S}"/gcc/Makefile.in || die "Failed to update gcc!"
-}
-
# do various updates to PIE logic
do_gcc_PIE_patches() {
want_pie || return 0
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-12-06 4:15 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-12-06 4:15 UTC (permalink / raw
To: gentoo-commits
vapier 11/12/06 04:15:10
Modified: toolchain.eclass
Log:
turn libssp support into a USE flag and drop all the manual detection of SSP in the C library
Revision Changes Path
1.495 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.495&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.495&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.494&r2=1.495
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.494
retrieving revision 1.495
diff -u -r1.494 -r1.495
--- toolchain.eclass 6 Dec 2011 04:07:16 -0000 1.494
+++ toolchain.eclass 6 Dec 2011 04:15:10 -0000 1.495
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.494 2011/12/06 04:07:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.495 2011/12/06 04:15:10 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -94,7 +94,7 @@
IUSE+=" bootstrap doc gcj gtk hardened libffi multilib objc"
tc_version_is_at_least "4.0" && IUSE+=" objc-gc mudflap"
- tc_version_is_at_least "4.1" && IUSE+=" objc++"
+ tc_version_is_at_least "4.1" && IUSE+=" libssp objc++"
tc_version_is_at_least "4.2" && IUSE+=" openmp"
tc_version_is_at_least "4.3" && IUSE+=" fixed-point"
tc_version_is_at_least "4.4" && IUSE+=" graphite"
@@ -424,18 +424,6 @@
return 1
}
-has_libssp() {
- [[ -e /$(get_libdir)/libssp.so ]] && return 0
- return 1
-}
-
-want_libssp() {
- [[ ${GCC_LIBSSP_SUPPORT} == "true" ]] || return 1
- has_libssp || return 1
- [[ -n ${PP_VER} ]] || return 1
- return 0
-}
-
_want_stuff() {
local var=$1 flag=$2
[[ -z ${!var} ]] && return 1
@@ -469,39 +457,6 @@
return 1
}
-# This function determines whether or not libc has been patched with stack
-# smashing protection support.
-libc_has_ssp() {
- [[ ${ROOT} != "/" ]] && return 0
-
- # lib hacks taken from sandbox configure
- echo 'int main(){}' > "${T}"/libctest.c
- LC_ALL=C gcc "${T}"/libctest.c -lc -o libctest -Wl,-verbose &> "${T}"/libctest.log || return 1
- local libc_file=$(awk '/attempt to open/ { if (($4 ~ /\/libc\.so/) && ($5 == "succeeded")) LIBC = $4; }; END {print LIBC}' "${T}"/libctest.log)
-
- [[ -z ${libc_file} ]] && die "Unable to find a libc !?"
-
- # Check for gcc-4.x style ssp support
- if [[ -n $(readelf -s "${libc_file}" 2>/dev/null | \
- grep 'FUNC.*GLOBAL.*__stack_chk_fail') ]]
- then
- return 0
- else
- # Check for gcc-3.x style ssp support
- if [[ -n $(readelf -s "${libc_file}" 2>/dev/null | \
- grep 'OBJECT.*GLOBAL.*__guard') ]] && \
- [[ -n $(readelf -s "${libc_file}" 2>/dev/null | \
- grep 'FUNC.*GLOBAL.*__stack_smash_handler') ]]
- then
- return 0
- elif is_crosscompile ; then
- die "'${libc_file}' was detected w/out ssp, that sucks (a lot)"
- else
- return 1
- fi
- fi
-}
-
# This is to make sure we don't accidentally try to enable support for a
# language that doesnt exist. GCC 3.4 supports f77, while 4.0 supports f95, etc.
#
@@ -672,8 +627,6 @@
use_if_iuse gcj && ewarn 'GCJ requires a C++ compiler, disabled due to USE="-cxx"'
fi
- want_libssp && libc_has_ssp && \
- die "libssp cannot be used with a glibc that has been patched to provide ssp symbols"
want_minispecs
unset LANGUAGES #265283
@@ -971,7 +924,7 @@
confgcc+=" --disable-libmudflap"
fi
- if want_libssp ; then
+ if use_if_iuse libssp ; then
confgcc+=" --enable-libssp"
else
export gcc_cv_libc_provides_ssp=yes
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-12-06 4:50 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-12-06 4:50 UTC (permalink / raw
To: gentoo-commits
vapier 11/12/06 04:50:32
Modified: toolchain.eclass
Log:
drop {PIE,SSP}_UNSUPPORTED variable checking since no one sets these, and it relies on checking $ACCEPT_KEYWORDS which portage no longer exports
Revision Changes Path
1.496 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.496&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.496&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.495&r2=1.496
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.495
retrieving revision 1.496
diff -u -r1.495 -r1.496
--- toolchain.eclass 6 Dec 2011 04:15:10 -0000 1.495
+++ toolchain.eclass 6 Dec 2011 04:50:32 -0000 1.496
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.495 2011/12/06 04:15:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.496 2011/12/06 04:50:32 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -343,24 +343,14 @@
[[ ${CTARGET} == *-freebsd* ]] && return 1
want_pie || return 1
- tc_version_is_at_least 4.3.2 && use nopie && return 1
- hardened_gcc_is_stable pie && return 0
- if has "~$(tc-arch)" ${ACCEPT_KEYWORDS} ; then
- hardened_gcc_check_unsupported pie && return 1
- ewarn "Allowing pie-by-default for an unstable arch ($(tc-arch))"
- return 0
- fi
- return 1
+ use_if_iuse nopie && return 1
+ hardened_gcc_is_stable pie
+ return $?
elif [[ $1 == "ssp" ]] ; then
[[ -n ${SPECS_VER} ]] || return 1
- tc_version_is_at_least 4.3.2 && use nossp && return 1
- hardened_gcc_is_stable ssp && return 0
- if has "~$(tc-arch)" ${ACCEPT_KEYWORDS} ; then
- hardened_gcc_check_unsupported ssp && return 1
- ewarn "Allowing ssp-by-default for an unstable arch ($(tc-arch))"
- return 0
- fi
- return 1
+ use_if_iuse no$1 && return 1
+ hardened_gcc_is_stable ssp
+ return $?
else
# laziness ;)
hardened_gcc_works pie || return 1
@@ -394,36 +384,6 @@
return 1
}
-hardened_gcc_check_unsupported() {
- local tocheck=""
- # if a variable is unset, we assume that all archs are unsupported. since
- # this function is never called if hardened_gcc_is_stable returns true,
- # this shouldn't cause problems... however, allowing this logic to work
- # even with the variables unset will break older ebuilds that dont use them.
- if [[ $1 == "pie" ]] ; then
- if [[ ${CTARGET} == *-uclibc* ]] ; then
- [[ -z ${PIE_UCLIBC_UNSUPPORTED} ]] && return 0
- tocheck="${tocheck} ${PIE_UCLIBC_UNSUPPORTED}"
- else
- [[ -z ${PIE_GLIBC_UNSUPPORTED} ]] && return 0
- tocheck="${tocheck} ${PIE_GLIBC_UNSUPPORTED}"
- fi
- elif [[ $1 == "ssp" ]] ; then
- if [[ ${CTARGET} == *-uclibc* ]] ; then
- [[ -z ${SSP_UCLIBC_UNSUPPORTED} ]] && return 0
- tocheck="${tocheck} ${SSP_UCLIBC_UNSUPPORTED}"
- else
- [[ -z ${SSP_UNSUPPORTED} ]] && return 0
- tocheck="${tocheck} ${SSP_UNSUPPORTED}"
- fi
- else
- die "hardened_gcc_check_unsupported needs to be called with pie or ssp"
- fi
-
- has $(tc-arch) ${tocheck} && return 0
- return 1
-}
-
_want_stuff() {
local var=$1 flag=$2
[[ -z ${!var} ]] && return 1
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-12-06 4:52 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-12-06 4:52 UTC (permalink / raw
To: gentoo-commits
vapier 11/12/06 04:52:25
Modified: toolchain.eclass
Log:
drop HARDENED_{GCC,PIE}_WORKS variable checking since no one sets these anymore
Revision Changes Path
1.497 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.497&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.497&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.496&r2=1.497
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.496
retrieving revision 1.497
diff -u -r1.496 -r1.497
--- toolchain.eclass 6 Dec 2011 04:50:32 -0000 1.496
+++ toolchain.eclass 6 Dec 2011 04:52:25 -0000 1.497
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.496 2011/12/06 04:50:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.497 2011/12/06 04:52:25 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -348,7 +348,7 @@
return $?
elif [[ $1 == "ssp" ]] ; then
[[ -n ${SPECS_VER} ]] || return 1
- use_if_iuse no$1 && return 1
+ use_if_iuse nossp && return 1
hardened_gcc_is_stable ssp
return $?
else
@@ -360,21 +360,18 @@
}
hardened_gcc_is_stable() {
+ local tocheck
if [[ $1 == "pie" ]] ; then
- # HARDENED_* variables are deprecated and here for compatibility
- local tocheck="${HARDENED_PIE_WORKS} ${HARDENED_GCC_WORKS}"
if [[ ${CTARGET} == *-uclibc* ]] ; then
- tocheck="${tocheck} ${PIE_UCLIBC_STABLE}"
+ tocheck=${PIE_UCLIBC_STABLE}
else
- tocheck="${tocheck} ${PIE_GLIBC_STABLE}"
+ tocheck=${PIE_GLIBC_STABLE}
fi
elif [[ $1 == "ssp" ]] ; then
- # ditto
- local tocheck="${HARDENED_SSP_WORKS} ${HARDENED_GCC_WORKS}"
if [[ ${CTARGET} == *-uclibc* ]] ; then
- tocheck="${tocheck} ${SSP_UCLIBC_STABLE}"
+ tocheck=${SSP_UCLIBC_STABLE}
else
- tocheck="${tocheck} ${SSP_STABLE}"
+ tocheck=${SSP_STABLE}
fi
else
die "hardened_gcc_stable needs to be called with pie or ssp"
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-12-06 4:54 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-12-06 4:54 UTC (permalink / raw
To: gentoo-commits
vapier 11/12/06 04:54:39
Modified: toolchain.eclass
Log:
collapse redundant hardened_gcc_works checks in want_minispecs
Revision Changes Path
1.498 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.498&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.498&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.497&r2=1.498
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.497
retrieving revision 1.498
diff -u -r1.497 -r1.498
--- toolchain.eclass 6 Dec 2011 04:52:25 -0000 1.497
+++ toolchain.eclass 6 Dec 2011 04:54:39 -0000 1.498
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.497 2011/12/06 04:52:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.498 2011/12/06 04:54:39 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -403,7 +403,7 @@
ewarn "You will not get hardened features if you have the vanilla USE-flag."
elif use nopie && use nossp ; then
ewarn "You will not get hardened features if you have the nopie and nossp USE-flag."
- elif ! hardened_gcc_works pie && ! hardened_gcc_works ssp && ! use nopie ; then
+ elif ! hardened_gcc_works ; then
ewarn "Your $(tc-arch) arch is not supported."
else
return 0
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-12-06 4:59 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-12-06 4:59 UTC (permalink / raw
To: gentoo-commits
vapier 11/12/06 04:59:42
Modified: toolchain.eclass
Log:
unify duplicate sed statements in make_gcc_hard
Revision Changes Path
1.499 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.499&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.499&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.498&r2=1.499
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.498
retrieving revision 1.499
diff -u -r1.498 -r1.499
--- toolchain.eclass 6 Dec 2011 04:54:39 -0000 1.498
+++ toolchain.eclass 6 Dec 2011 04:59:41 -0000 1.499
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.498 2011/12/06 04:54:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.499 2011/12/06 04:59:41 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -429,25 +429,22 @@
#---->> specs + env.d logic <<----
-# defaults to enable for all hardened toolchains
-gcc_common_hard="-DEFAULT_RELRO -DEFAULT_BIND_NOW"
-
# configure to build with the hardened GCC specs as the default
make_gcc_hard() {
+ # defaults to enable for all hardened toolchains
+ local gcc_hard_flags="-DEFAULT_RELRO -DEFAULT_BIND_NOW"
+
if hardened_gcc_works ; then
einfo "Updating gcc to use automatic PIE + SSP building ..."
- sed -e "s|^HARD_CFLAGS = |HARD_CFLAGS = -DEFAULT_PIE_SSP ${gcc_common_hard} |" \
- -i "${S}"/gcc/Makefile.in || die "Failed to update gcc!"
+ gcc_hard_flags+=" -DEFAULT_PIE_SSP"
elif hardened_gcc_works pie ; then
einfo "Updating gcc to use automatic PIE building ..."
ewarn "SSP has not been enabled by default"
- sed -e "s|^HARD_CFLAGS = |HARD_CFLAGS = -DEFAULT_PIE ${gcc_common_hard} |" \
- -i "${S}"/gcc/Makefile.in || die "Failed to update gcc!"
+ gcc_hard_flags+=" -DEFAULT_PIE"
elif hardened_gcc_works ssp ; then
einfo "Updating gcc to use automatic SSP building ..."
ewarn "PIE has not been enabled by default"
- sed -e "s|^HARD_CFLAGS = |HARD_CFLAGS = -DEFAULT_SSP ${gcc_common_hard} |" \
- -i "${S}"/gcc/Makefile.in || die "Failed to update gcc!"
+ gcc_hard_flags+=" -DEFAULT_SSP"
else
# do nothing if hardened isnt supported, but dont die either
ewarn "hardened is not supported for this arch in this gcc version"
@@ -455,6 +452,10 @@
return 0
fi
+ sed -i \
+ -e "/^HARD_CFLAGS = /s|=|= ${gcc_hard_flags} |" \
+ "${S}"/gcc/Makefile.in || die
+
# rebrand to make bug reports easier
BRANDING_GCC_PKGVERSION=${BRANDING_GCC_PKGVERSION/Gentoo/Gentoo Hardened}
}
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-12-06 5:02 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-12-06 5:02 UTC (permalink / raw
To: gentoo-commits
vapier 11/12/06 05:02:05
Modified: toolchain.eclass
Log:
the make_gcc_hard func already displays info messages, so simplify the calling code
Revision Changes Path
1.500 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.500&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.500&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.499&r2=1.500
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.499
retrieving revision 1.500
diff -u -r1.499 -r1.500
--- toolchain.eclass 6 Dec 2011 04:59:41 -0000 1.499
+++ toolchain.eclass 6 Dec 2011 05:02:05 -0000 1.500
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.499 2011/12/06 04:59:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.500 2011/12/06 05:02:05 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -755,10 +755,7 @@
do_gcc_PIE_patches
epatch_user
- if use hardened ; then
- einfo "updating configuration to build hardened GCC"
- make_gcc_hard || die "failed to make gcc hard"
- fi
+ use hardened && make_gcc_hard
if is_libffi ; then
# move the libffi target out of gcj and into all
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-12-06 5:10 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-12-06 5:10 UTC (permalink / raw
To: gentoo-commits
vapier 11/12/06 05:10:02
Modified: toolchain.eclass
Log:
simplify the setup of $S and $SRC_URI a bit
Revision Changes Path
1.501 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.501&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.501&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.500&r2=1.501
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.500
retrieving revision 1.501
diff -u -r1.500 -r1.501
--- toolchain.eclass 6 Dec 2011 05:02:05 -0000 1.500
+++ toolchain.eclass 6 Dec 2011 05:10:02 -0000 1.501
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.500 2011/12/06 05:02:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.501 2011/12/06 05:10:02 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -170,20 +170,17 @@
#---->> S + SRC_URI essentials <<----
-# This function sets the source directory depending on whether we're using
+# Set the source directory depending on whether we're using
# a prerelease, snapshot, or release tarball.
-gcc_get_s_dir() {
- local GCC_S
+S=$(
if [[ -n ${PRERELEASE} ]] ; then
- GCC_S=${WORKDIR}/gcc-${PRERELEASE}
+ echo ${WORKDIR}/gcc-${PRERELEASE}
elif [[ -n ${SNAPSHOT} ]] ; then
- GCC_S=${WORKDIR}/gcc-${SNAPSHOT}
+ echo ${WORKDIR}/gcc-${SNAPSHOT}
else
- GCC_S=${WORKDIR}/gcc-${GCC_RELEASE_VER}
+ echo ${WORKDIR}/gcc-${GCC_RELEASE_VER}
fi
- echo "${GCC_S}"
-}
-S=$(gcc_get_s_dir)
+)
# This function handles the basics of setting the SRC_URI for a gcc ebuild.
# To use, set SRC_URI with:
@@ -268,49 +265,39 @@
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} ]] && \
- GCC_SRC_URI="${GCC_SRC_URI} $(gentoo_urls gcc-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2)"
+ GCC_SRC_URI+=" $(gentoo_urls gcc-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2)"
fi
- # uclibc lovin
- [[ -n ${UCLIBC_VER} ]] && \
- GCC_SRC_URI="${GCC_SRC_URI} $(gentoo_urls gcc-${UCLIBC_GCC_VER}-uclibc-patches-${UCLIBC_VER}.tar.bz2)"
-
- # various gentoo patches
- [[ -n ${PATCH_VER} ]] && \
- GCC_SRC_URI="${GCC_SRC_URI} $(gentoo_urls gcc-${PATCH_GCC_VER}-patches-${PATCH_VER}.tar.bz2)"
+ [[ -n ${UCLIBC_VER} ]] && GCC_SRC_URI+=" $(gentoo_urls gcc-${UCLIBC_GCC_VER}-uclibc-patches-${UCLIBC_VER}.tar.bz2)"
+ [[ -n ${PATCH_VER} ]] && GCC_SRC_URI+=" $(gentoo_urls gcc-${PATCH_GCC_VER}-patches-${PATCH_VER}.tar.bz2)"
# strawberry pie, Cappuccino and a Gauloises (it's a good thing)
[[ -n ${PIE_VER} ]] && \
PIE_CORE=${PIE_CORE:-gcc-${PIE_GCC_VER}-piepatches-v${PIE_VER}.tar.bz2} && \
- GCC_SRC_URI="${GCC_SRC_URI} $(gentoo_urls ${PIE_CORE})"
+ GCC_SRC_URI+=" $(gentoo_urls ${PIE_CORE})"
# gcc minispec for the hardened gcc 4 compiler
- [[ -n ${SPECS_VER} ]] && \
- GCC_SRC_URI="${GCC_SRC_URI} $(gentoo_urls gcc-${SPECS_GCC_VER}-specs-${SPECS_VER}.tar.bz2)"
+ [[ -n ${SPECS_VER} ]] && GCC_SRC_URI+=" $(gentoo_urls gcc-${SPECS_GCC_VER}-specs-${SPECS_VER}.tar.bz2)"
# gcc bounds checking patch
if [[ -n ${HTB_VER} ]] ; then
local HTBFILE="bounds-checking-gcc-${HTB_GCC_VER}-${HTB_VER}.patch.bz2"
- GCC_SRC_URI="${GCC_SRC_URI}
+ GCC_SRC_URI+="
boundschecking? (
mirror://sourceforge/boundschecking/${HTBFILE}
$(gentoo_urls ${HTBFILE})
)"
fi
- # support for the D language
- [[ -n ${D_VER} ]] && \
- GCC_SRC_URI="${GCC_SRC_URI} d? ( mirror://sourceforge/dgcc/gdc-${D_VER}-src.tar.bz2 )"
+ [[ -n ${D_VER} ]] && GCC_SRC_URI+=" d? ( mirror://sourceforge/dgcc/gdc-${D_VER}-src.tar.bz2 )"
# >= gcc-4.3 uses ecj.jar and we only add gcj as a use flag under certain
# conditions
if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then
if tc_version_is_at_least "4.5" ; then
- GCC_SRC_URI="${GCC_SRC_URI}
- gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )"
+ GCC_SRC_URI+=" gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )"
elif tc_version_is_at_least "4.3" ; then
- GCC_SRC_URI="${GCC_SRC_URI}
- gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )"
+ GCC_SRC_URI+=" gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )"
fi
fi
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-12-06 5:22 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-12-06 5:22 UTC (permalink / raw
To: gentoo-commits
vapier 11/12/06 05:22:24
Modified: toolchain.eclass
Log:
simplify GCC_LANG logic
Revision Changes Path
1.502 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.502&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.502&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.501&r2=1.502
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.501
retrieving revision 1.502
diff -u -r1.501 -r1.502
--- toolchain.eclass 6 Dec 2011 05:10:02 -0000 1.501
+++ toolchain.eclass 6 Dec 2011 05:22:24 -0000 1.502
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.501 2011/12/06 05:10:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.502 2011/12/06 05:22:24 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -984,45 +984,34 @@
;;
esac
- GCC_LANG="c"
- is_cxx && GCC_LANG="${GCC_LANG},c++"
- is_d && GCC_LANG="${GCC_LANG},d"
- is_gcj && GCC_LANG="${GCC_LANG},java"
- is_go && GCC_LANG="${GCC_LANG},go"
+ local GCC_LANG="c"
+ is_cxx && GCC_LANG+=",c++"
+ is_d && GCC_LANG+=",d"
+ is_gcj && GCC_LANG+=",java"
+ is_go && GCC_LANG+=",go"
if is_objc || is_objcxx ; then
- GCC_LANG="${GCC_LANG},objc"
+ GCC_LANG+=",objc"
if tc_version_is_at_least "4.0" ; then
use objc-gc && confgcc+=" --enable-objc-gc"
fi
- is_objcxx && GCC_LANG="${GCC_LANG},obj-c++"
+ is_objcxx && GCC_LANG+=",obj-c++"
fi
- is_treelang && GCC_LANG="${GCC_LANG},treelang"
+ 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
# currently supported standard depending on gcc version.
- is_fortran && GCC_LANG="${GCC_LANG},fortran"
- is_f77 && GCC_LANG="${GCC_LANG},f77"
- is_f95 && GCC_LANG="${GCC_LANG},f95"
+ is_fortran && GCC_LANG+=",fortran"
+ is_f77 && GCC_LANG+=",f77"
+ is_f95 && GCC_LANG+=",f95"
# We do NOT want 'ADA support' in here!
- # is_ada && GCC_LANG="${GCC_LANG},ada"
+ # is_ada && GCC_LANG+=",ada"
einfo "configuring for GCC_LANG: ${GCC_LANG}"
+ confgcc+=" --enable-languages=${GCC_LANG}"
}
-# Other than the variables described for gcc_setup_variables, the following
-# will alter tha behavior of gcc_do_configure:
-#
-# CTARGET
-# CBUILD
-# Enable building for a target that differs from CHOST
-#
-# GCC_LANG
-# Enable support for ${GCC_LANG} languages. defaults to just "c"
-#
-# Travis Tilley <lv@gentoo.org> (04 Sep 2004)
-#
gcc_do_configure() {
local confgcc
@@ -1115,11 +1104,6 @@
gcc-compiler-configure || die
- # if not specified, assume we are building for a target that only
- # requires C support
- GCC_LANG=${GCC_LANG:-c}
- confgcc+=" --enable-languages=${GCC_LANG}"
-
if is_crosscompile ; then
# When building a stage1 cross-compiler (just C compiler), we have to
# disable a bunch of features or gcc goes boom
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-12-06 20:11 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-12-06 20:11 UTC (permalink / raw
To: gentoo-commits
vapier 11/12/06 20:11:50
Modified: toolchain.eclass
Log:
fix multilib assumptions when setting up LDPATH (that there is only "32" and "64" subdirs), and make it work regardless of active profile
Revision Changes Path
1.503 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.503&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.503&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.502&r2=1.503
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.502
retrieving revision 1.503
diff -u -r1.502 -r1.503
--- toolchain.eclass 6 Dec 2011 05:22:24 -0000 1.502
+++ toolchain.eclass 6 Dec 2011 20:11:50 -0000 1.503
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.502 2011/12/06 05:22:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.503 2011/12/06 20:11:50 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -468,39 +468,21 @@
echo "ROOTPATH=\"${BINPATH}\"" >> ${gcc_envd_file}
echo "GCC_PATH=\"${BINPATH}\"" >> ${gcc_envd_file}
- if is_multilib ; then
- LDPATH="${LIBPATH}"
- for path in 32 64 ; do
- [[ -d ${D}${LIBPATH}/${path} ]] && LDPATH="${LDPATH}:${LIBPATH}/${path}"
- done
- else
- local MULTIDIR
- LDPATH="${LIBPATH}"
-
- # We want to list the default ABI's LIBPATH first so libtool
- # searches that directory first. This is a temporary
- # workaround for libtool being stupid and using .la's from
- # conflicting ABIs by using the first one in the search path
-
- local abi=${DEFAULT_ABI}
- local MULTIDIR=$($(XGCC) $(get_abi_CFLAGS ${abi}) --print-multi-directory)
- if [[ ${MULTIDIR} == "." ]] ; then
- LDPATH=${LIBPATH}
- else
- LDPATH=${LIBPATH}/${MULTIDIR}
- fi
-
- for abi in $(get_all_abis) ; do
- [[ ${abi} == ${DEFAULT_ABI} ]] && continue
+ # We want to list the default ABI's LIBPATH first so libtool
+ # searches that directory first. This is a temporary
+ # workaround for libtool being stupid and using .la's from
+ # conflicting ABIs by using the first one in the search path
+ local abi=${DEFAULT_ABI}
+ local MULTIDIR=$($(XGCC) $(get_abi_CFLAGS ${abi}) --print-multi-directory)
+ local LDPATH=${LIBPATH}
+ [[ ${MULTIDIR} != "." ]] && LDPATH+=/${MULTIDIR}
+ for abi in $(get_all_abis) ; do
+ [[ ${abi} == ${DEFAULT_ABI} ]] && continue
- MULTIDIR=$($(XGCC) $(get_abi_CFLAGS ${abi}) --print-multi-directory)
- if [[ ${MULTIDIR} == "." ]] ; then
- LDPATH=${LDPATH}:${LIBPATH}
- else
- LDPATH=${LDPATH}:${LIBPATH}/${MULTIDIR}
- fi
- done
- fi
+ MULTIDIR=$($(XGCC) $(get_abi_CFLAGS ${abi}) --print-multi-directory)
+ LDPATH+=:${LIBPATH}
+ [[ ${MULTIDIR} != "." ]] && LDPATH+=/${MULTIDIR}
+ done
echo "LDPATH=\"${LDPATH}\"" >> ${gcc_envd_file}
echo "MANPATH=\"${DATAPATH}/man\"" >> ${gcc_envd_file}
@@ -1381,6 +1363,7 @@
}
toolchain_src_compile() {
+ multilib_env ${CTARGET}
gcc_do_filter_flags
einfo "CFLAGS=\"${CFLAGS}\""
einfo "CXXFLAGS=\"${CXXFLAGS}\""
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-12-06 21:30 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-12-06 21:30 UTC (permalink / raw
To: gentoo-commits
vapier 11/12/06 21:30:01
Modified: toolchain.eclass
Log:
backport x32 support to 4.6.2+ until 4.7.0+ is released
Revision Changes Path
1.504 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.504&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.504&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.503&r2=1.504
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.503
retrieving revision 1.504
diff -u -r1.503 -r1.504
--- toolchain.eclass 6 Dec 2011 20:11:50 -0000 1.503
+++ toolchain.eclass 6 Dec 2011 21:30:01 -0000 1.504
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.503 2011/12/06 20:11:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.504 2011/12/06 21:30:01 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -825,7 +825,14 @@
# translate our notion of multilibs into gcc's
local abi map=() list
case ${CTARGET} in
- x86_64*) tc_version_is_at_least 4.7 && map=(amd64:m64 x86:m32 x32:mx32) ;;
+ x86_64*)
+ # drop the 4.6.2 stuff once 4.7 goes stable
+ if tc_version_is_at_least 4.7 ||
+ ( tc_version_is_at_least 4.6.2 && has x32 $(get_all_abis) )
+ then
+ map=(amd64:m64 x86:m32 x32:mx32)
+ fi
+ ;;
esac
for abi in $(get_all_abis) ; do
local m a l
@@ -1887,7 +1894,10 @@
if [[ ${SYMLINK_LIB} == "yes" ]] ; then
einfo "updating multilib directories to be: ${libdirs}"
- if tc_version_is_at_least 4.7 && [[ ${CTARGET} == x86_64*-linux* ]] ; then
+ # drop the 4.6.2 stuff once 4.7 goes stable
+ if tc_version_is_at_least 4.7 ||
+ ( tc_version_is_at_least 4.6.2 && has x32 $(get_all_abis) )
+ then
set -- -e '/^MULTILIB_OSDIRNAMES.*lib32/s:[$][(]if.*):../lib32:'
else
set -- -e "/^MULTILIB_OSDIRNAMES/s:=.*:= ${libdirs}:"
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-12-06 22:12 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-12-06 22:12 UTC (permalink / raw
To: gentoo-commits
vapier 11/12/06 22:12:41
Modified: toolchain.eclass
Log:
send `chown root` output to /dev/null so that we dont dump a lot of crap when test installing as non-root (e.g. ebuild ... install)
Revision Changes Path
1.505 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.505&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.505&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.504&r2=1.505
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.504
retrieving revision 1.505
diff -u -r1.504 -r1.505
--- toolchain.eclass 6 Dec 2011 21:30:01 -0000 1.504
+++ toolchain.eclass 6 Dec 2011 22:12:41 -0000 1.505
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.504 2011/12/06 21:30:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.505 2011/12/06 22:12:41 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1542,9 +1542,10 @@
doexe "${GCC_FILESDIR}"/c{89,99} || die
fi
- # use gid of 0 because some stupid ports don't have
- # the group 'root' set to gid 0
- chown -R root:0 "${D}"${LIBPATH}
+ # Use gid of 0 because some stupid ports don't have
+ # the group 'root' set to gid 0. Send to /dev/null
+ # for people who are testing as non-root.
+ chown -R root:0 "${D}"${LIBPATH} 2>/dev/null
# Move pretty-printers to gdb datadir to shut ldconfig up
local py gdbdir=/usr/share/gdb/auto-load${LIBPATH/\/lib\//\/$(get_libdir)\/}
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-12-07 16:11 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-12-07 16:11 UTC (permalink / raw
To: gentoo-commits
vapier 11/12/07 16:11:17
Modified: toolchain.eclass
Log:
use -depth/-delete to simplify empty dir pruning
Revision Changes Path
1.507 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.507&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.507&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.506&r2=1.507
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.506
retrieving revision 1.507
diff -u -r1.506 -r1.507
--- toolchain.eclass 7 Dec 2011 00:29:38 -0000 1.506
+++ toolchain.eclass 7 Dec 2011 16:11:17 -0000 1.507
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.506 2011/12/07 00:29:38 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.507 2011/12/07 16:11:17 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1516,9 +1516,7 @@
|| prepman "${DATAPATH}"
fi
# prune empty dirs left behind
- for x in 1 2 3 4 ; do
- find "${D}" -type d -exec rmdir "{}" \; >& /dev/null
- done
+ find "${D}" -depth -type d -delete 2>/dev/null
# install testsuite results
if use test; then
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-12-08 18:11 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-12-08 18:11 UTC (permalink / raw
To: gentoo-commits
vapier 11/12/08 18:11:32
Modified: toolchain.eclass
Log:
handle --with-abi for x86_64 targets too, and unify with the --with-multilib-list option
Revision Changes Path
1.508 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.508&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.508&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.507&r2=1.508
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.507
retrieving revision 1.508
diff -u -r1.507 -r1.508
--- toolchain.eclass 7 Dec 2011 16:11:17 -0000 1.507
+++ toolchain.eclass 8 Dec 2011 18:11:32 -0000 1.508
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.507 2011/12/07 16:11:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.508 2011/12/08 18:11:32 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -814,6 +814,21 @@
disable_multilib_libjava || die "failed to disable multilib java"
}
+gcc-abi-map() {
+ # Convert the ABI name we use in Gentoo to what gcc uses
+ local map=()
+ case ${CTARGET} in
+ mips*) map=("o32 32" "n32 n32" "n64 64") ;;
+ x86_64*) map=("amd64 m64" "x86 m32" "x32 mx32") ;;
+ esac
+
+ local m
+ for m in "${map[@]}" ; do
+ l=( ${m} )
+ [[ $1 == ${l[0]} ]] && echo ${l[1]} && break
+ done
+}
+
gcc-multilib-configure() {
# if multilib is disabled, get out quick!
if ! is_multilib ; then
@@ -824,26 +839,23 @@
fi
# translate our notion of multilibs into gcc's
- local abi map=() list
- case ${CTARGET} in
- x86_64*)
- # drop the 4.6.2 stuff once 4.7 goes stable
- if tc_version_is_at_least 4.7 ||
- ( tc_version_is_at_least 4.6.2 && has x32 $(get_all_abis) )
- then
- map=(amd64:m64 x86:m32 x32:mx32)
- fi
- ;;
- esac
+ local abi list
for abi in $(get_all_abis) ; do
- local m a l
- for m in "${map[@]}" ; do
- a=${m%:*}
- l=${m#*:}
- [[ ${abi} == ${a} ]] && list=",${l}${list}"
- done
+ local l=$(gcc-abi-map ${abi})
+ [[ -n ${l} ]] && list+=",${l}"
done
- [[ -n ${list} ]] && confgcc+=" --with-multilib-list=${list:1}"
+ if [[ -n ${list} ]] ; then
+ case ${CTARGET} in
+ x86_64*)
+ # drop the 4.6.2 stuff once 4.7 goes stable
+ if tc_version_is_at_least 4.7 ||
+ ( tc_version_is_at_least 4.6.2 && has x32 $(get_all_abis) )
+ then
+ confgcc+=" --with-multilib-list=${list:1}"
+ fi
+ ;;
+ esac
+ fi
}
gcc-compiler-configure() {
@@ -932,6 +944,7 @@
confgcc+=" --disable-libquadmath"
fi
+ local with_abi_map=()
case $(tc-arch) in
arm) #264534
local arm_arch="${CTARGET%%-*}"
@@ -951,12 +964,9 @@
confgcc+=" --with-float=hard"
fi
;;
- # Add --with-abi flags to set default MIPS ABI
- mips)
- local mips_abi=""
- [[ ${DEFAULT_ABI} == n64 ]] && mips_abi="--with-abi=64"
- [[ ${DEFAULT_ABI} == n32 ]] && mips_abi="--with-abi=n32"
- [[ -n ${mips_abi} ]] && confgcc+=" ${mips_abi}"
+ # Add --with-abi flags to set default ABI
+ amd64|mips)
+ confgcc+=" --with-abi=$(gcc-abi-map ${DEFAULT_ABI})"
;;
# Default arch for x86 is normally i386, lets give it a bump
# since glibc will do so based on CTARGET anyways
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-12-08 22:38 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-12-08 22:38 UTC (permalink / raw
To: gentoo-commits
vapier 11/12/08 22:38:33
Modified: toolchain.eclass
Log:
only use --with-abi for x86_64 targets with recent enough versions as reported by chutzpah
Revision Changes Path
1.509 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.509&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.509&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.508&r2=1.509
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.508
retrieving revision 1.509
diff -u -r1.508 -r1.509
--- toolchain.eclass 8 Dec 2011 18:11:32 -0000 1.508
+++ toolchain.eclass 8 Dec 2011 22:38:33 -0000 1.509
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.508 2011/12/08 18:11:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.509 2011/12/08 22:38:33 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -965,9 +965,17 @@
fi
;;
# Add --with-abi flags to set default ABI
- amd64|mips)
+ mips)
confgcc+=" --with-abi=$(gcc-abi-map ${DEFAULT_ABI})"
;;
+ amd64)
+ # drop the 4.6.2 stuff once 4.7 goes stable
+ if tc_version_is_at_least 4.7 ||
+ ( tc_version_is_at_least 4.6.2 && has x32 $(get_all_abis) )
+ then
+ confgcc+=" --with-abi=$(gcc-abi-map ${DEFAULT_ABI})"
+ fi
+ ;;
# Default arch for x86 is normally i386, lets give it a bump
# since glibc will do so based on CTARGET anyways
x86)
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-12-10 8:55 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-12-10 8:55 UTC (permalink / raw
To: gentoo-commits
vapier 11/12/10 08:55:37
Modified: toolchain.eclass
Log:
enable {bi,multi}arch support for ppc/x86 targets too #349405 by Denis Kaganovich
Revision Changes Path
1.510 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.510&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.510&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.509&r2=1.510
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.509
retrieving revision 1.510
diff -u -r1.509 -r1.510
--- toolchain.eclass 8 Dec 2011 22:38:33 -0000 1.509
+++ toolchain.eclass 10 Dec 2011 08:55:37 -0000 1.510
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.509 2011/12/08 22:38:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.510 2011/12/10 08:55:37 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1178,14 +1178,14 @@
esac
tc_version_is_at_least 3.4 || confgcc+=" --disable-libunwind-exceptions"
- # create a sparc*linux*-{gcc,g++} that can handle -m32 and -m64 (biarch)
- if [[ ${CTARGET} == sparc*linux* ]] \
- && is_multilib \
- && ! is_crosscompile \
- && tc_version_is_at_least 4.3
- then
- confgcc+=" --enable-targets=all"
- fi
+ # if the target can do biarch (-m32/-m64), enable it. overhead should
+ # be small, and should simplify building of 64bit kernels in a 32bit
+ # userland by not needing sys-devel/kgcc64. #349405
+ case $(tc-arch) in
+ ppc|ppc64) tc_version_is_at_least 3.4 && confgcc+=" --enable-targets=all" ;;
+ sparc) tc_version_is_at_least 4.4 && confgcc+=" --enable-targets=all" ;;
+ amd64|x86) tc_version_is_at_least 4.3 && confgcc+=" --enable-targets=all" ;;
+ esac
tc_version_is_at_least 4.3 && set -- "$@" \
--with-bugurl=http://bugs.gentoo.org/ \
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-12-13 0:21 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-12-13 0:21 UTC (permalink / raw
To: gentoo-commits
vapier 11/12/13 00:21:54
Modified: toolchain.eclass
Log:
automatically create a tarball of all config.log files when we fail, and tell the user to attach those so hopefully we can stop having to request these ourselves in bugzilla
Revision Changes Path
1.511 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.511&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.511&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.510&r2=1.511
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.510
retrieving revision 1.511
diff -u -r1.510 -r1.511
--- toolchain.eclass 10 Dec 2011 08:55:37 -0000 1.510
+++ toolchain.eclass 13 Dec 2011 00:21:54 -0000 1.511
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.510 2011/12/10 08:55:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.511 2011/12/13 00:21:54 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1216,6 +1216,16 @@
popd > /dev/null
}
+has toolchain_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS+=" toolchain_death_notice"
+toolchain_death_notice() {
+ pushd "${WORKDIR}"/build >/dev/null
+ tar jcf gcc-build-logs.tar.bz2 $(find -name config.log)
+ eerror
+ eerror "Please include ${PWD}/gcc-build-logs.tar.bz2 in your bug report"
+ eerror
+ popd >/dev/null
+}
+
# This function accepts one optional argument, the make target to be used.
# If ommitted, gcc_do_make will try to guess whether it should use all,
# profiledbootstrap, or bootstrap-lean depending on CTARGET and arch. An
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-12-15 5:58 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-12-15 5:58 UTC (permalink / raw
To: gentoo-commits
vapier 11/12/15 05:58:47
Modified: toolchain.eclass
Log:
replace `want_boundschecking` with `use_if_iuse boundschecking` since they have the same backing logic, and merge the (now) single user of _want_stuff into want_pie so we can simplify that func in a follow up commit
Revision Changes Path
1.512 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.512&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.512&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.511&r2=1.512
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.511
retrieving revision 1.512
diff -u -r1.511 -r1.512
--- toolchain.eclass 13 Dec 2011 00:21:54 -0000 1.511
+++ toolchain.eclass 15 Dec 2011 05:58:47 -0000 1.512
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.511 2011/12/13 00:21:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.512 2011/12/15 05:58:47 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -369,18 +369,13 @@
return 1
}
-_want_stuff() {
- local var=$1 flag=$2
- [[ -z ${!var} ]] && return 1
- use ${flag} && return 0
- return 1
-}
-want_boundschecking() { _want_stuff HTB_VER boundschecking ; }
want_pie() {
! use hardened && [[ -n ${PIE_VER} ]] && use nopie && return 1
[[ -n ${PIE_VER} ]] && [[ -n ${SPECS_VER} ]] && return 0
tc_version_is_at_least 4.3.2 && return 1
- _want_stuff PIE_VER !nopie
+ [[ -z ${PIE_VER} ]] && return 1
+ use !nopie && return 0
+ return 1
}
want_minispecs() {
@@ -1265,10 +1260,12 @@
# the gcc docs state that parallel make isnt supported for the
# profiledbootstrap target, as collisions in profile collecting may occur.
- [[ ${GCC_MAKE_TARGET} == "profiledbootstrap" ]] && export MAKEOPTS="${MAKEOPTS} -j1"
-
- # boundschecking seems to introduce parallel build issues
- want_boundschecking && export MAKEOPTS="${MAKEOPTS} -j1"
+ # boundschecking also seems to introduce parallel build issues.
+ if [[ ${GCC_MAKE_TARGET} == "profiledbootstrap" ]] ||
+ use_if_iuse boundschecking
+ then
+ export MAKEOPTS="${MAKEOPTS} -j1"
+ fi
if [[ ${GCC_MAKE_TARGET} == "all" ]] ; then
STAGE1_CFLAGS=${STAGE1_CFLAGS-"${CFLAGS}"}
@@ -1743,14 +1740,13 @@
unpack gcc-${SPECS_GCC_VER}-specs-${SPECS_VER}.tar.bz2
fi
- want_boundschecking && \
- unpack "bounds-checking-gcc-${HTB_GCC_VER}-${HTB_VER}.patch.bz2"
+ use_if_iuse boundschecking && unpack "bounds-checking-gcc-${HTB_GCC_VER}-${HTB_VER}.patch.bz2"
popd > /dev/null
}
do_gcc_HTB_patches() {
- want_boundschecking || return 0
+ use_if_iuse boundschecking || return 0
# modify the bounds checking patch with a regression patch
epatch "${WORKDIR}/bounds-checking-gcc-${HTB_GCC_VER}-${HTB_VER}.patch"
@@ -1761,10 +1757,6 @@
do_gcc_PIE_patches() {
want_pie || return 0
- want_boundschecking \
- && rm -f "${WORKDIR}"/piepatch/*/*-boundschecking-no.patch* \
- || rm -f "${WORKDIR}"/piepatch/*/*-boundschecking-yes.patch*
-
use vanilla && return 0
if tc_version_is_at_least 4.3.2; then
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-12-15 20:42 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-12-15 20:42 UTC (permalink / raw
To: gentoo-commits
vapier 11/12/15 20:42:13
Modified: toolchain.eclass
Log:
simplify gcc_version_patch slightly
Revision Changes Path
1.513 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.513&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.513&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.512&r2=1.513
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.512
retrieving revision 1.513
diff -u -r1.512 -r1.513
--- toolchain.eclass 15 Dec 2011 05:58:47 -0000 1.512
+++ toolchain.eclass 15 Dec 2011 20:42:13 -0000 1.513
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.512 2011/12/15 05:58:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.513 2011/12/15 20:42:13 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1866,20 +1866,18 @@
tc_version_is_at_least 4.3 && return 0
local version_string=${GCC_CONFIG_VER}
- [[ -n ${BRANCH_UPDATE} ]] && version_string="${version_string} ${BRANCH_UPDATE}"
+ [[ -n ${BRANCH_UPDATE} ]] && version_string+=" ${BRANCH_UPDATE}"
einfo "patching gcc version: ${version_string} (${BRANDING_GCC_PKGVERSION})"
+ local gcc_sed=( -e 's:gcc\.gnu\.org/bugs\.html:bugs\.gentoo\.org/:' )
if grep -qs VERSUFFIX "${S}"/gcc/version.c ; then
- sed -i -e "s~VERSUFFIX \"\"~VERSUFFIX \" (${BRANDING_GCC_PKGVERSION})\"~" \
- "${S}"/gcc/version.c || die "failed to update VERSUFFIX with Gentoo branding"
+ gcc_sed+=( -e "/VERSUFFIX \"\"/s:\"\":\" (${BRANDING_GCC_PKGVERSION})\":" )
else
version_string="${version_string} (${BRANDING_GCC_PKGVERSION})"
- sed -i -e "s~\(const char version_string\[\] = \"\).*\(\".*\)~\1$version_string\2~" \
- "${S}"/gcc/version.c || die "failed to update version.c with Gentoo branding."
+ gcc_sed+=( -e "/const char version_string\[\] = /s:= \".*\":= \"${version_string}\":" )
fi
- sed -i -e 's~gcc\.gnu\.org\/bugs\.html~bugs\.gentoo\.org\/~' \
- "${S}"/gcc/version.c || die "Failed to change the bug URL"
+ sed -i "${gcc_sed[@]}" "${S}"/gcc/version.c || die
}
# This is a historical wart. The original Gentoo/amd64 port used:
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2011-12-16 18:44 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2011-12-16 18:44 UTC (permalink / raw
To: gentoo-commits
vapier 11/12/16 18:44:34
Modified: toolchain.eclass
Log:
--with-abi support for amd64 has not yet been merged into master #394823 by Helmut Jarausch
Revision Changes Path
1.514 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.514&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.514&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.513&r2=1.514
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.513
retrieving revision 1.514
diff -u -r1.513 -r1.514
--- toolchain.eclass 15 Dec 2011 20:42:13 -0000 1.513
+++ toolchain.eclass 16 Dec 2011 18:44:34 -0000 1.514
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.513 2011/12/15 20:42:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.514 2011/12/16 18:44:34 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -964,10 +964,9 @@
confgcc+=" --with-abi=$(gcc-abi-map ${DEFAULT_ABI})"
;;
amd64)
- # drop the 4.6.2 stuff once 4.7 goes stable
- if tc_version_is_at_least 4.7 ||
- ( tc_version_is_at_least 4.6.2 && has x32 $(get_all_abis) )
- then
+ # drop the older/ABI checks once this get's merged into some
+ # version of gcc upstream
+ if [[ ${PV} == "4.6.2" ]] && has x32 $(get_all_abis) ; then
confgcc+=" --with-abi=$(gcc-abi-map ${DEFAULT_ABI})"
fi
;;
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2012-02-28 23:34 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2012-02-28 23:34 UTC (permalink / raw
To: gentoo-commits
vapier 12/02/28 23:34:16
Modified: toolchain.eclass
Log:
drop cxxabi.h relocation since it appears to be unnecessary nowadays with our compiler layout #406209 by Matthias Dahl
Revision Changes Path
1.518 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.518&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.518&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.517&r2=1.518
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.517
retrieving revision 1.518
diff -u -r1.517 -r1.518
--- toolchain.eclass 20 Feb 2012 07:18:47 -0000 1.517
+++ toolchain.eclass 28 Feb 2012 23:34:16 -0000 1.518
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.517 2012/02/20 07:18:47 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.518 2012/02/28 23:34:16 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1470,10 +1470,6 @@
gcc_slot_java
- # Move <cxxabi.h> to compiler-specific directories
- [[ -f ${D}${STDCXX_INCDIR}/cxxabi.h ]] && \
- mv -f "${D}"${STDCXX_INCDIR}/cxxabi.h "${D}"${LIBPATH}/include/
-
# These should be symlinks
dodir /usr/bin
cd "${D}"${BINPATH}
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2012-03-02 5:56 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2012-03-02 5:56 UTC (permalink / raw
To: gentoo-commits
vapier 12/03/02 05:56:29
Modified: toolchain.eclass
Log:
install versioned symlinks for cross-compilers too #220149 by cJ
Revision Changes Path
1.519 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.519&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.519&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.518&r2=1.519
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.518
retrieving revision 1.519
diff -u -r1.518 -r1.519
--- toolchain.eclass 28 Feb 2012 23:34:16 -0000 1.518
+++ toolchain.eclass 2 Mar 2012 05:56:29 -0000 1.519
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.518 2012/02/28 23:34:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.519 2012/03/02 05:56:29 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1478,7 +1478,7 @@
# this should take care of that
[[ -f ${x} ]] && mv ${x} ${CTARGET}-${x}
- if [[ -f ${CTARGET}-${x} ]] && ! is_crosscompile ; then
+ if [[ -f ${CTARGET}-${x} ]] ; then
ln -sf ${CTARGET}-${x} ${x}
# Create version-ed symlinks
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2012-03-03 2:47 Ryan Hill (dirtyepic)
0 siblings, 0 replies; 266+ messages in thread
From: Ryan Hill (dirtyepic) @ 2012-03-03 2:47 UTC (permalink / raw
To: gentoo-commits
dirtyepic 12/03/03 02:47:12
Modified: toolchain.eclass
Log:
Update comment about cloog/cloog-ppl.
Revision Changes Path
1.521 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.521&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.521&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.520&r2=1.521
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.520
retrieving revision 1.521
diff -u -r1.520 -r1.521
--- toolchain.eclass 3 Mar 2012 02:29:41 -0000 1.520
+++ toolchain.eclass 3 Mar 2012 02:47:11 -0000 1.521
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.520 2012/03/03 02:29:41 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.521 2012/03/03 02:47:11 dirtyepic Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1058,9 +1058,13 @@
tc_version_is_at_least "4.3" && confgcc+=" $(use_enable fixed-point)"
# Graphite support was added in 4.4, which depends on external libraries
- # for optimizations. Up to 4.6 we use cloog-ppl (cloog fork with Parma PPL
- # backend). Later versions will use upstream cloog with the ISL backend. We
- # disable the PPL version check so we can use >=ppl-0.11.
+ # for optimizations. Current versions use cloog-ppl (cloog fork with Parma
+ # PPL backend). Sometime in the future we will use upstream cloog with the
+ # ISL backend (note: PPL will still be a requirement). cloog-ppl's include
+ # path was modified to prevent collisions between the two packages (library
+ # names are different).
+ #
+ # We disable the PPL version check so we can use >=ppl-0.11.
if tc_version_is_at_least "4.4"; then
confgcc+=" $(use_with graphite ppl)"
confgcc+=" $(use_with graphite cloog)"
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2012-03-03 22:42 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2012-03-03 22:42 UTC (permalink / raw
To: gentoo-commits
vapier 12/03/03 22:42:47
Modified: toolchain.eclass
Log:
add a useful default DESCRIPTION, do not set a release tarball for 9999 versions, and move I_PROMISE_TO_SUPPLY_PATCHES_WITH_BUGS check here to avoid copying to all snapshot/live ebuilds
Revision Changes Path
1.522 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.522&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.522&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.521&r2=1.522
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.521
retrieving revision 1.522
diff -u -r1.521 -r1.522
--- toolchain.eclass 3 Mar 2012 02:47:11 -0000 1.521
+++ toolchain.eclass 3 Mar 2012 22:42:47 -0000 1.522
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.521 2012/03/03 02:47:11 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.522 2012/03/03 22:42:47 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -12,7 +12,7 @@
inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib fixheadtails pax-utils
EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_test pkg_preinst src_install pkg_postinst pkg_prerm pkg_postrm
-DESCRIPTION="Based on the ${ECLASS} eclass"
+DESCRIPTION="The GNU Compiler Collection"
FEATURES=${FEATURES/multilib-strict/}
#----<< eclass stuff >>----
@@ -262,7 +262,7 @@
GCC_SRC_URI="ftp://gcc.gnu.org/pub/gcc/prerelease-${PRERELEASE}/gcc-${PRERELEASE}.tar.bz2"
elif [[ -n ${SNAPSHOT} ]] ; then
GCC_SRC_URI="ftp://sources.redhat.com/pub/gcc/snapshots/${SNAPSHOT}/gcc-${SNAPSHOT}.tar.bz2"
- else
+ elif [[ ${PV} != *9999* ]] ; then
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} ]] && \
@@ -533,6 +533,13 @@
#---->> pkg_* <<----
toolchain_pkg_setup() {
+ if [[ -n ${PRERELEASE}${SNAPSHOT} || ${PV} == *9999* ]] &&
+ [[ -z ${I_PROMISE_TO_SUPPLY_PATCHES_WITH_BUGS} ]]
+ then
+ die "Please \`export I_PROMISE_TO_SUPPLY_PATCHES_WITH_BUGS=1\` or define it in your make.conf if you want to use this version." \
+ "This is to try and cut down on people filing bugs for a compiler we do not currently support."
+ fi
+
# Setup variables which would normally be in the profile
if is_crosscompile ; then
multilib_env ${CTARGET}
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2012-03-04 5:40 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2012-03-04 5:40 UTC (permalink / raw
To: gentoo-commits
vapier 12/03/04 05:40:27
Modified: toolchain.eclass
Log:
initial live git support
Revision Changes Path
1.523 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.523&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.523&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.522&r2=1.523
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.522
retrieving revision 1.523
diff -u -r1.522 -r1.523
--- toolchain.eclass 3 Mar 2012 22:42:47 -0000 1.522
+++ toolchain.eclass 4 Mar 2012 05:40:27 -0000 1.523
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.522 2012/03/03 22:42:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.523 2012/03/04 05:40:27 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -11,6 +11,18 @@
inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib fixheadtails pax-utils
+if [[ ${PV} == *9999* ]] ; then
+ EGIT_REPO_URI="git://gcc.gnu.org/git/gcc.git"
+ # naming style:
+ # gcc-9999 -> master
+ # gcc-4.7_pre9999 -> 4.7 branch
+ if [[ ${PV} == *_pre9999* ]] ; then
+ EGIT_BRANCH="${PN}_${PV%_pre9999}_branch"
+ EGIT_BRANCH=${EGIT_BRANCH//./_}
+ fi
+ inherit git-2
+fi
+
EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_test pkg_preinst src_install pkg_postinst pkg_prerm pkg_postrm
DESCRIPTION="The GNU Compiler Collection"
@@ -702,11 +714,13 @@
done
}
toolchain_src_unpack() {
+ [[ ${PV} == *9999* ]] && git-2_src_unpack
+
export BRANDING_GCC_PKGVERSION="Gentoo ${GCC_PVR}"
[[ -z ${UCLIBC_VER} ]] && [[ ${CTARGET} == *-uclibc* ]] && die "Sorry, this version does not support uClibc"
- [[ -z ${GCC_SVN} ]] && gcc_quick_unpack
+ gcc_quick_unpack
cd "${S}"
@@ -1691,7 +1705,7 @@
unpack gcc-${PRERELEASE}.tar.bz2
elif [[ -n ${SNAPSHOT} ]] ; then
unpack gcc-${SNAPSHOT}.tar.bz2
- else
+ elif [[ ${PV} != *9999* ]] ; then
unpack gcc-${GCC_RELEASE_VER}.tar.bz2
# We want branch updates to be against a release tarball
if [[ -n ${BRANCH_UPDATE} ]] ; then
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2012-03-04 18:46 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2012-03-04 18:46 UTC (permalink / raw
To: gentoo-commits
vapier 12/03/04 18:46:56
Modified: toolchain.eclass
Log:
revise versioned symlink creation #406765 #220149
Revision Changes Path
1.524 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.524&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.524&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.523&r2=1.524
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.523
retrieving revision 1.524
diff -u -r1.523 -r1.524
--- toolchain.eclass 4 Mar 2012 05:40:27 -0000 1.523
+++ toolchain.eclass 4 Mar 2012 18:46:55 -0000 1.524
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.523 2012/03/04 05:40:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.524 2012/03/04 18:46:55 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1500,13 +1500,15 @@
[[ -f ${x} ]] && mv ${x} ${CTARGET}-${x}
if [[ -f ${CTARGET}-${x} ]] ; then
- ln -sf ${CTARGET}-${x} ${x}
+ if ! is_crosscompile ; then
+ ln -sf ${CTARGET}-${x} ${x}
+ dosym ${BINPATH}/${CTARGET}-${x} \
+ /usr/bin/${x}-${GCC_CONFIG_VER}
+ fi
# Create version-ed symlinks
dosym ${BINPATH}/${CTARGET}-${x} \
/usr/bin/${CTARGET}-${x}-${GCC_CONFIG_VER}
- dosym ${BINPATH}/${CTARGET}-${x} \
- /usr/bin/${x}-${GCC_CONFIG_VER}
fi
if [[ -f ${CTARGET}-${x}-${GCC_CONFIG_VER} ]] ; then
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2012-03-14 20:46 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2012-03-14 20:46 UTC (permalink / raw
To: gentoo-commits
vapier 12/03/14 20:46:35
Modified: toolchain.eclass
Log:
also rename gcov for people in the gcc-bin dir
Revision Changes Path
1.530 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.530&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.530&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.529&r2=1.530
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.529
retrieving revision 1.530
diff -u -r1.529 -r1.530
--- toolchain.eclass 10 Mar 2012 21:21:30 -0000 1.529
+++ toolchain.eclass 14 Mar 2012 20:46:35 -0000 1.530
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.529 2012/03/10 21:21:30 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.530 2012/03/14 20:46:35 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1500,7 +1500,9 @@
# These should be symlinks
dodir /usr/bin
cd "${D}"${BINPATH}
- for x in cpp gcc g++ c++ g77 gcj gcjh gfortran gccgo ; do
+ # Ugh: we really need to auto-detect this list.
+ # It's constantly out of date.
+ for x in cpp gcc g++ c++ gcov g77 gcj gcjh gfortran gccgo ; do
# For some reason, g77 gets made instead of ${CTARGET}-g77...
# this should take care of that
[[ -f ${x} ]] && mv ${x} ${CTARGET}-${x}
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2012-03-15 20:18 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2012-03-15 20:18 UTC (permalink / raw
To: gentoo-commits
vapier 12/03/15 20:18:03
Modified: toolchain.eclass
Log:
require gcc-config-1.5+ now that everyone is stable (has ABI CFLAGS fixes and go support)
Revision Changes Path
1.531 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.531&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.531&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.530&r2=1.531
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.530
retrieving revision 1.531
diff -u -r1.530 -r1.531
--- toolchain.eclass 14 Mar 2012 20:46:35 -0000 1.530
+++ toolchain.eclass 15 Mar 2012 20:18:03 -0000 1.531
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.530 2012/03/14 20:46:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.531 2012/03/15 20:18:03 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -178,7 +178,7 @@
DEPEND+=" gcj? ( gtk? ( ${GCJ_GTK_DEPS} ) ${GCJ_DEPS} )"
fi
-PDEPEND=">=sys-devel/gcc-config-1.4"
+PDEPEND=">=sys-devel/gcc-config-1.5"
#----<< DEPEND >>----
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2012-04-14 17:00 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2012-04-14 17:00 UTC (permalink / raw
To: gentoo-commits
vapier 12/04/14 17:00:35
Modified: toolchain.eclass
Log:
simplify SLOT logic a bit by dropping CTARGET as we no longer need it -- we have CATEGORY=cross-${CTARGET} to keep things unique
Revision Changes Path
1.533 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.533&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.533&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.532&r2=1.533
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.532
retrieving revision 1.533
diff -u -r1.532 -r1.533
--- toolchain.eclass 22 Mar 2012 06:07:08 -0000 1.532
+++ toolchain.eclass 14 Apr 2012 17:00:35 -0000 1.533
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.532 2012/03/22 06:07:08 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.533 2012/04/14 17:00:35 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -117,9 +117,7 @@
# Support upgrade paths here or people get pissed
if use multislot ; then
- SLOT="${CTARGET}-${GCC_CONFIG_VER}"
-elif is_crosscompile; then
- SLOT="${CTARGET}-${GCC_BRANCH_VER}"
+ SLOT="${GCC_CONFIG_VER}"
else
SLOT="${GCC_BRANCH_VER}"
fi
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2012-05-10 5:03 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2012-05-10 5:03 UTC (permalink / raw
To: gentoo-commits
vapier 12/05/10 05:03:22
Modified: toolchain.eclass
Log:
arm: rework default --with-arch selection to be more tolerant of endian variations #414395 by Bertrand Jacquin, to automatically throw away unknown arm encodings #264534, and to select vfpv3-d16 by default for hardfp targets -- people can override this at runtime if they wish via CFLAGS, or via EXTRA_ECONF when building gcc
Revision Changes Path
1.534 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.534&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.534&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.533&r2=1.534
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.533
retrieving revision 1.534
diff -u -r1.533 -r1.534
--- toolchain.eclass 14 Apr 2012 17:00:35 -0000 1.533
+++ toolchain.eclass 10 May 2012 05:03:22 -0000 1.534
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.533 2012/04/14 17:00:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.534 2012/05/10 05:03:22 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -962,22 +962,32 @@
local with_abi_map=()
case $(tc-arch) in
- arm) #264534
- local arm_arch="${CTARGET%%-*}"
- # Only do this if arm_arch is armv*
- if [[ ${arm_arch} == armv* ]] ; then
- # Convert armv7{a,r,m} to armv7-{a,r,m}
- [[ ${arm_arch} == armv7? ]] && arm_arch=${arm_arch/7/7-}
- # Remove endian ('l' / 'eb')
- [[ ${arm_arch} == *l ]] && arm_arch=${arm_arch%l}
- [[ ${arm_arch} == *eb ]] && arm_arch=${arm_arch%eb}
+ arm) #264534 #414395
+ local a arm_arch=${CTARGET%%-*}
+ # Remove trailing endian variations first: eb el be bl b l
+ for a in e{b,l} {b,l}e b l ; do
+ if [[ ${arm_arch} == *${a} ]] ; then
+ arm_arch=${arm_arch%${a}}
+ break
+ fi
+ done
+ # Convert armv7{a,r,m} to armv7-{a,r,m}
+ [[ ${arm_arch} == armv7? ]] && arm_arch=${arm_arch/7/7-}
+ # See if this is a valid --with-arch flag
+ if (srcdir=${S}/gcc target=${CTARGET} with_arch=${arm_arch};
+ . "${srcdir}"/config.gcc) &>/dev/null
+ then
confgcc+=" --with-arch=${arm_arch}"
fi
# Enable hardvfp
- if [[ ${CTARGET##*-} == *eabi ]] && [[ $(tc-is-hardfloat) == yes ]] && \
- tc_version_is_at_least "4.5" ; then
- confgcc+=" --with-float=hard"
+ if [[ ${CTARGET##*-} == *eabi* ]] && \
+ [[ $(tc-is-hardfloat) == yes ]] && \
+ tc_version_is_at_least "4.5"
+ then
+ confgcc+=" --with-float=hard"
+ # Follow the new arm hardfp distro standard by default
+ confgcc+=" --with-fpu=vfpv3-d16"
fi
;;
# Add --with-abi flags to set default ABI
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2012-05-13 20:20 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2012-05-13 20:20 UTC (permalink / raw
To: gentoo-commits
vapier 12/05/13 20:20:23
Modified: toolchain.eclass
Log:
drop warnings for old versions of code
Revision Changes Path
1.535 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.535&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.535&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.534&r2=1.535
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.534
retrieving revision 1.535
diff -u -r1.534 -r1.535
--- toolchain.eclass 10 May 2012 05:03:22 -0000 1.534
+++ toolchain.eclass 13 May 2012 20:20:23 -0000 1.535
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.534 2012/05/10 05:03:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.535 2012/05/13 20:20:23 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -590,23 +590,6 @@
echo
fi
- # If our gcc-config version doesn't like '-' in it's version string,
- # tell our users that gcc-config will yell at them, but it's all good.
- if ! has_version '>=sys-devel/gcc-config-1.3.10-r1' && [[ ${GCC_CONFIG_VER/-/} != ${GCC_CONFIG_VER} ]] ; then
- ewarn "Your version of gcc-config will issue about having an invalid profile"
- ewarn "when switching to this profile. It is safe to ignore this warning,"
- ewarn "and this problem has been corrected in >=sys-devel/gcc-config-1.3.10-r1."
- fi
-
- if ! is_crosscompile && ! use multislot && [[ ${GCCMAJOR}.${GCCMINOR} == 3.4 ]] ; then
- echo
- ewarn "You should make sure to rebuild all your C++ packages when"
- ewarn "upgrading between different versions of gcc. For example,"
- ewarn "when moving to gcc-3.4 from gcc-3.3, emerge gentoolkit and run:"
- ewarn " # revdep-rebuild --library libstdc++.so.5"
- echo
- fi
-
if ! is_crosscompile ; then
# hack to prevent collisions between SLOT
[[ ! -d ${ROOT}/$(get_libdir)/rcscripts/awk ]] \
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2012-05-13 20:24 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2012-05-13 20:24 UTC (permalink / raw
To: gentoo-commits
vapier 12/05/13 20:24:28
Modified: toolchain.eclass
Log:
use `use_if_iuse` with bootstrap since not all versions have this
Revision Changes Path
1.536 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.536&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.536&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.535&r2=1.536
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.535
retrieving revision 1.536
diff -u -r1.535 -r1.536
--- toolchain.eclass 13 May 2012 20:20:23 -0000 1.535
+++ toolchain.eclass 13 May 2012 20:24:28 -0000 1.536
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.535 2012/05/13 20:20:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.536 2012/05/13 20:24:28 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1802,7 +1802,7 @@
should_we_gcc_config() {
# we always want to run gcc-config if we're bootstrapping, otherwise
# we might get stuck with the c-only stage1 compiler
- use bootstrap && return 0
+ use_if_iuse bootstrap && return 0
use build && return 0
# if the current config is invalid, we definitely want a new one
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2012-05-15 18:51 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2012-05-15 18:51 UTC (permalink / raw
To: gentoo-commits
vapier 12/05/15 18:51:21
Modified: toolchain.eclass
Log:
install .awk into /usr/share/gcc-data/ to avoid /lib/ mess, and we dont need it in /. same goes for fix_libtool_files.sh in /usr/sbin rather than /sbin. #415947 by Jim Faulkner.
Revision Changes Path
1.537 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.537&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.537&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.536&r2=1.537
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.536
retrieving revision 1.537
diff -u -r1.536 -r1.537
--- toolchain.eclass 13 May 2012 20:24:28 -0000 1.536
+++ toolchain.eclass 15 May 2012 18:51:21 -0000 1.537
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.536 2012/05/13 20:24:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.537 2012/05/15 18:51:21 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -591,23 +591,19 @@
fi
if ! is_crosscompile ; then
- # hack to prevent collisions between SLOT
- [[ ! -d ${ROOT}/$(get_libdir)/rcscripts/awk ]] \
- && mkdir -p "${ROOT}"/$(get_libdir)/rcscripts/awk
- [[ ! -d ${ROOT}/sbin ]] \
- && mkdir -p "${ROOT}"/sbin
- cp "${ROOT}/${DATAPATH}"/fixlafiles.awk "${ROOT}"/$(get_libdir)/rcscripts/awk/ || die "installing fixlafiles.awk"
- cp "${ROOT}/${DATAPATH}"/fix_libtool_files.sh "${ROOT}"/sbin/ || die "installing fix_libtool_files.sh"
+ # hack to prevent collisions between SLOTs
+
+ # Clean up old paths
+ rm -f "${ROOT}"/*/rcscripts/awk/fixlafiles.awk "${ROOT}"/sbin/fix_libtool_files.sh
+ rmdir "${ROOT}"/*/rcscripts{/awk,} 2>/dev/null
+
+ mkdir -p "${ROOT}"/usr/{share/gcc-data,sbin,bin}
+ cp "${ROOT}/${DATAPATH}"/fixlafiles.awk "${ROOT}"/usr/share/gcc-data/ || die
+ cp "${ROOT}/${DATAPATH}"/fix_libtool_files.sh "${ROOT}"/usr/sbin/ || die
- [[ ! -d ${ROOT}/usr/bin ]] \
- && mkdir -p "${ROOT}"/usr/bin
# Since these aren't critical files and portage sucks with
# handling of binpkgs, don't require these to be found
- for x in "${ROOT}/${DATAPATH}"/c{89,99} ; do
- if [[ -e ${x} ]]; then
- cp ${x} "${ROOT}"/usr/bin/ || die "installing c89/c99"
- fi
- done
+ cp "${ROOT}/${DATAPATH}"/c{89,99} "${ROOT}"/usr/bin/ 2>/dev/null
fi
}
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2012-05-18 4:59 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2012-05-18 4:59 UTC (permalink / raw
To: gentoo-commits
vapier 12/05/18 04:59:55
Modified: toolchain.eclass
Log:
only default armv7 to vfpv3-d16. default armv6 to vfp, but otherwise, keep the rest defaulting to softfloat. #415937 by jannis
Revision Changes Path
1.538 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.538&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.538&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.537&r2=1.538
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.537
retrieving revision 1.538
diff -u -r1.537 -r1.538
--- toolchain.eclass 15 May 2012 18:51:21 -0000 1.537
+++ toolchain.eclass 18 May 2012 04:59:55 -0000 1.538
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.537 2012/05/15 18:51:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.538 2012/05/18 04:59:55 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -960,13 +960,16 @@
fi
# Enable hardvfp
- if [[ ${CTARGET##*-} == *eabi* ]] && \
- [[ $(tc-is-hardfloat) == yes ]] && \
+ if [[ $(tc-is-softfloat) == no ]] && \
+ [[ ${CTARGET} == armv[67]* ]] && \
tc_version_is_at_least "4.5"
then
- confgcc+=" --with-float=hard"
# Follow the new arm hardfp distro standard by default
- confgcc+=" --with-fpu=vfpv3-d16"
+ confgcc+=" --with-float=hard"
+ case ${CTARGET} in
+ armv6*) confgcc+=" --with-fpu=vfp" ;;
+ armv7*) confgcc+=" --with-fpu=vfpv3-d16" ;;
+ esac
fi
;;
# Add --with-abi flags to set default ABI
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2012-05-22 5:08 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2012-05-22 5:08 UTC (permalink / raw
To: gentoo-commits
vapier 12/05/22 05:08:29
Modified: toolchain.eclass
Log:
drop x32 support for 4.6.x versions now that we have 4.7.0
Revision Changes Path
1.539 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.539&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.539&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.538&r2=1.539
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.538
retrieving revision 1.539
diff -u -r1.538 -r1.539
--- toolchain.eclass 18 May 2012 04:59:55 -0000 1.538
+++ toolchain.eclass 22 May 2012 05:08:29 -0000 1.539
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.538 2012/05/18 04:59:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.539 2012/05/22 05:08:29 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -842,12 +842,7 @@
if [[ -n ${list} ]] ; then
case ${CTARGET} in
x86_64*)
- # drop the 4.6.2 stuff once 4.7 goes stable
- if tc_version_is_at_least 4.7 ||
- ( tc_version_is_at_least 4.6.2 && has x32 $(get_all_abis) )
- then
- confgcc+=" --with-multilib-list=${list:1}"
- fi
+ tc_version_is_at_least 4.7 && confgcc+=" --with-multilib-list=${list:1}"
;;
esac
fi
@@ -979,7 +974,7 @@
amd64)
# drop the older/ABI checks once this get's merged into some
# version of gcc upstream
- if [[ ${PV} == "4.6.2" ]] && has x32 $(get_all_abis) ; then
+ if tc_version_is_at_least 4.7 && has x32 $(get_all_abis) ; then
confgcc+=" --with-abi=$(gcc-abi-map ${DEFAULT_ABI})"
fi
;;
@@ -1925,10 +1920,7 @@
if [[ ${SYMLINK_LIB} == "yes" ]] ; then
einfo "updating multilib directories to be: ${libdirs}"
- # drop the 4.6.2 stuff once 4.7 goes stable
- if tc_version_is_at_least 4.7 ||
- ( tc_version_is_at_least 4.6.2 && has x32 $(get_all_abis) )
- then
+ if tc_version_is_at_least 4.7 ; then
set -- -e '/^MULTILIB_OSDIRNAMES.*lib32/s:[$][(]if.*):../lib32:'
else
set -- -e "/^MULTILIB_OSDIRNAMES/s:=.*:= ${libdirs}:"
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2012-05-30 15:47 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2012-05-30 15:47 UTC (permalink / raw
To: gentoo-commits
vapier 12/05/30 15:47:48
Modified: toolchain.eclass
Log:
handle mingw64 targets in the libc cross-compiler logic #417793 by Matt Whitlock
Revision Changes Path
1.540 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.540&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.540&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.539&r2=1.540
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.539
retrieving revision 1.540
diff -u -r1.539 -r1.540
--- toolchain.eclass 22 May 2012 05:08:29 -0000 1.539
+++ toolchain.eclass 30 May 2012 15:47:47 -0000 1.540
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.539 2012/05/22 05:08:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.540 2012/05/30 15:47:47 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1125,7 +1125,9 @@
*-gnu*) needed_libc=glibc;;
*-klibc) needed_libc=klibc;;
*-uclibc*) needed_libc=uclibc;;
- *-cygwin) needed_libc=cygwin;;
+ *-cygwin) needed_libc=cygwin;;
+ x86_64-*-mingw*|\
+ *-w64-mingw*) needed_libc=mingw64-runtime;;
mingw*|*-mingw*) needed_libc=mingw-runtime;;
avr) confgcc+=" --enable-shared --disable-threads";;
esac
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2012-06-02 20:16 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2012-06-02 20:16 UTC (permalink / raw
To: gentoo-commits
vapier 12/06/02 20:16:59
Modified: toolchain.eclass
Log:
punt pkg_postrm as we no longer install these files into the / paths (rev 1.537), which means these files dont exist for us to touch in the first place #415947
Revision Changes Path
1.542 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.542&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.542&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.541&r2=1.542
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.541
retrieving revision 1.542
diff -u -r1.541 -r1.542
--- toolchain.eclass 31 May 2012 17:45:08 -0000 1.541
+++ toolchain.eclass 2 Jun 2012 20:16:59 -0000 1.542
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.541 2012/05/31 17:45:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.542 2012/06/02 20:16:59 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -23,7 +23,7 @@
inherit git-2
fi
-EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_test pkg_preinst src_install pkg_postinst pkg_prerm pkg_postrm
+EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_test pkg_preinst src_install pkg_postinst pkg_prerm
DESCRIPTION="The GNU Compiler Collection"
FEATURES=${FEATURES/multilib-strict/}
@@ -607,12 +607,6 @@
fi
}
-toolchain_pkg_prerm() {
- # Don't let these files be uninstalled #87647
- touch -c "${ROOT}"/sbin/fix_libtool_files.sh \
- "${ROOT}"/$(get_libdir)/rcscripts/awk/fixlafiles.awk
-}
-
toolchain_pkg_postrm() {
# to make our lives easier (and saner), we do the fix_libtool stuff here.
# rather than checking SLOT's and trying in upgrade paths, we just see if
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2012-06-02 20:18 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2012-06-02 20:18 UTC (permalink / raw
To: gentoo-commits
vapier 12/06/02 20:18:57
Modified: toolchain.eclass
Log:
drop multilib_env setup calls since crossdev supports multilib now, and host builds provide info via the profile
Revision Changes Path
1.543 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.543&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.543&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.542&r2=1.543
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.542
retrieving revision 1.543
diff -u -r1.542 -r1.543
--- toolchain.eclass 2 Jun 2012 20:16:59 -0000 1.542
+++ toolchain.eclass 2 Jun 2012 20:18:57 -0000 1.543
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.542 2012/06/02 20:16:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.543 2012/06/02 20:18:57 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -550,14 +550,6 @@
"This is to try and cut down on people filing bugs for a compiler we do not currently support."
fi
- # Setup variables which would normally be in the profile
- if is_crosscompile ; then
- multilib_env ${CTARGET}
- if ! is_multilib ; then
- MULTILIB_ABIS=${DEFAULT_ABI}
- fi
- fi
-
# we dont want to use the installed compiler's specs to build gcc!
unset GCC_SPECS
@@ -1399,7 +1391,6 @@
}
toolchain_src_compile() {
- multilib_env ${CTARGET}
gcc_do_filter_flags
einfo "CFLAGS=\"${CFLAGS}\""
einfo "CXXFLAGS=\"${CXXFLAGS}\""
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2012-06-02 20:39 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2012-06-02 20:39 UTC (permalink / raw
To: gentoo-commits
vapier 12/06/02 20:39:06
Modified: toolchain.eclass
Log:
delete pkg_prerm from export_functions since its no longer defined
Revision Changes Path
1.544 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.544&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.544&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.543&r2=1.544
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.543
retrieving revision 1.544
diff -u -r1.543 -r1.544
--- toolchain.eclass 2 Jun 2012 20:18:57 -0000 1.543
+++ toolchain.eclass 2 Jun 2012 20:39:05 -0000 1.544
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.543 2012/06/02 20:18:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.544 2012/06/02 20:39:05 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -23,7 +23,7 @@
inherit git-2
fi
-EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_test pkg_preinst src_install pkg_postinst pkg_prerm
+EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_test pkg_preinst src_install pkg_postinst
DESCRIPTION="The GNU Compiler Collection"
FEATURES=${FEATURES/multilib-strict/}
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2012-06-02 20:40 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2012-06-02 20:40 UTC (permalink / raw
To: gentoo-commits
vapier 12/06/02 20:40:09
Modified: toolchain.eclass
Log:
punt pkg_preinst as it is merely a stub and no one calls it anymore
Revision Changes Path
1.545 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.545&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.545&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.544&r2=1.545
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.544
retrieving revision 1.545
diff -u -r1.544 -r1.545
--- toolchain.eclass 2 Jun 2012 20:39:05 -0000 1.544
+++ toolchain.eclass 2 Jun 2012 20:40:09 -0000 1.545
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.544 2012/06/02 20:39:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.545 2012/06/02 20:40:09 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -23,7 +23,7 @@
inherit git-2
fi
-EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_test pkg_preinst src_install pkg_postinst
+EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_test src_install pkg_postinst
DESCRIPTION="The GNU Compiler Collection"
FEATURES=${FEATURES/multilib-strict/}
@@ -564,10 +564,6 @@
unset LANGUAGES #265283
}
-toolchain_pkg_preinst() {
- :
-}
-
toolchain_pkg_postinst() {
do_gcc_config
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2012-06-03 9:00 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2012-06-03 9:00 UTC (permalink / raw
To: gentoo-commits
vapier 12/06/03 09:00:54
Modified: toolchain.eclass
Log:
teach gcc how to handle CTARGET abis independent of CHOST abis
Revision Changes Path
1.546 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.546&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.546&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.545&r2=1.546
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.545
retrieving revision 1.546
diff -u -r1.545 -r1.546
--- toolchain.eclass 2 Jun 2012 20:40:09 -0000 1.545
+++ toolchain.eclass 3 Jun 2012 09:00:54 -0000 1.546
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.545 2012/06/02 20:40:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.546 2012/06/03 09:00:54 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -37,6 +37,10 @@
export CTARGET=${CATEGORY/cross-}
fi
fi
+: ${TARGET_ABI:=${ABI}}
+: ${TARGET_MULTILIB_ABIS:=${MULTILIB_ABIS}}
+: ${TARGET_DEFAULT_ABI:=${DEFAULT_ABI}}
+
is_crosscompile() {
[[ ${CHOST} != ${CTARGET} ]]
}
@@ -478,12 +482,12 @@
# searches that directory first. This is a temporary
# workaround for libtool being stupid and using .la's from
# conflicting ABIs by using the first one in the search path
- local abi=${DEFAULT_ABI}
+ local abi=${TARGET_DEFAULT_ABI}
local MULTIDIR=$($(XGCC) $(get_abi_CFLAGS ${abi}) --print-multi-directory)
local LDPATH=${LIBPATH}
[[ ${MULTIDIR} != "." ]] && LDPATH+=/${MULTIDIR}
- for abi in $(get_all_abis) ; do
- [[ ${abi} == ${DEFAULT_ABI} ]] && continue
+ for abi in $(get_all_abis TARGET) ; do
+ [[ ${abi} == ${TARGET_DEFAULT_ABI} ]] && continue
MULTIDIR=$($(XGCC) $(get_abi_CFLAGS ${abi}) --print-multi-directory)
LDPATH+=:${LIBPATH}
@@ -817,7 +821,7 @@
# translate our notion of multilibs into gcc's
local abi list
- for abi in $(get_all_abis) ; do
+ for abi in $(get_all_abis TARGET) ; do
local l=$(gcc-abi-map ${abi})
[[ -n ${l} ]] && list+=",${l}"
done
@@ -951,13 +955,13 @@
;;
# Add --with-abi flags to set default ABI
mips)
- confgcc+=" --with-abi=$(gcc-abi-map ${DEFAULT_ABI})"
+ confgcc+=" --with-abi=$(gcc-abi-map ${TARGET_DEFAULT_ABI})"
;;
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) ; then
- confgcc+=" --with-abi=$(gcc-abi-map ${DEFAULT_ABI})"
+ if tc_version_is_at_least 4.7 && has x32 $(get_all_abis TARGET) ; then
+ confgcc+=" --with-abi=$(gcc-abi-map ${TARGET_DEFAULT_ABI})"
fi
;;
# Default arch for x86 is normally i386, lets give it a bump
@@ -1273,7 +1277,7 @@
else
# we only want to use the system's CFLAGS if not building a
# cross-compiler.
- BOOT_CFLAGS=${BOOT_CFLAGS-"$(get_abi_CFLAGS) ${CFLAGS}"}
+ BOOT_CFLAGS=${BOOT_CFLAGS-"$(get_abi_CFLAGS ${TARGET_DEFAULT_ABI}) ${CFLAGS}"}
fi
pushd "${WORKDIR}"/build
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2012-06-03 9:02 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2012-06-03 9:02 UTC (permalink / raw
To: gentoo-commits
vapier 12/06/03 09:02:36
Modified: toolchain.eclass
Log:
always build up the multilib list for gcc even when --disable-multilib as it needs that info when picking the default target (to make native x32 work again)
Revision Changes Path
1.547 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.547&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.547&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.546&r2=1.547
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.546
retrieving revision 1.547
diff -u -r1.546 -r1.547
--- toolchain.eclass 3 Jun 2012 09:00:54 -0000 1.546
+++ toolchain.eclass 3 Jun 2012 09:02:36 -0000 1.547
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.546 2012/06/03 09:00:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.547 2012/06/03 09:02:36 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -811,10 +811,12 @@
}
gcc-multilib-configure() {
- # if multilib is disabled, get out quick!
if ! is_multilib ; then
confgcc+=" --disable-multilib"
- return
+ # Fun times: if we are building for a target that has multiple
+ # possible ABI formats, and the user has told us to pick one
+ # that isn't the default, then not specifying it via the list
+ # below will break that on us.
else
confgcc+=" --enable-multilib"
fi
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2012-06-05 17:08 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2012-06-05 17:08 UTC (permalink / raw
To: gentoo-commits
vapier 12/06/05 17:08:41
Modified: toolchain.eclass
Log:
restore pkg_postrm export -- commit 1.542 was meant to delete pkg_prerm, not pkg_postrm as pointed out by Arfrever
Revision Changes Path
1.548 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.548&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.548&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.547&r2=1.548
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.547
retrieving revision 1.548
diff -u -r1.547 -r1.548
--- toolchain.eclass 3 Jun 2012 09:02:36 -0000 1.547
+++ toolchain.eclass 5 Jun 2012 17:08:41 -0000 1.548
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.547 2012/06/03 09:02:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.548 2012/06/05 17:08:41 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -23,7 +23,7 @@
inherit git-2
fi
-EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_test src_install pkg_postinst
+EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_test src_install pkg_postinst pkg_postrm
DESCRIPTION="The GNU Compiler Collection"
FEATURES=${FEATURES/multilib-strict/}
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2012-06-11 21:07 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2012-06-11 21:07 UTC (permalink / raw
To: gentoo-commits
vapier 12/06/11 21:07:31
Modified: toolchain.eclass
Log:
update path to fix_libtool_files.sh in toolchain_pkg_postrm #420731 by Piotr Karbowski
Revision Changes Path
1.550 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.550&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.550&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.549&r2=1.550
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.549
retrieving revision 1.550
diff -u -r1.549 -r1.550
--- toolchain.eclass 9 Jun 2012 06:56:14 -0000 1.549
+++ toolchain.eclass 11 Jun 2012 21:07:31 -0000 1.550
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.549 2012/06/09 06:56:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.550 2012/06/11 21:07:31 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -623,10 +623,10 @@
do_gcc_config
einfo "Running 'fix_libtool_files.sh ${GCC_RELEASE_VER}'"
- /sbin/fix_libtool_files.sh ${GCC_RELEASE_VER}
+ /usr/sbin/fix_libtool_files.sh ${GCC_RELEASE_VER}
if [[ -n ${BRANCH_UPDATE} ]] ; then
einfo "Running 'fix_libtool_files.sh ${GCC_RELEASE_VER}-${BRANCH_UPDATE}'"
- /sbin/fix_libtool_files.sh ${GCC_RELEASE_VER}-${BRANCH_UPDATE}
+ /usr/sbin/fix_libtool_files.sh ${GCC_RELEASE_VER}-${BRANCH_UPDATE}
fi
fi
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2012-08-19 1:23 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2012-08-19 1:23 UTC (permalink / raw
To: gentoo-commits
vapier 12/08/19 01:23:44
Modified: toolchain.eclass
Log:
use --enable-poison-system-directories with cross-compilers when the patch is available
Revision Changes Path
1.551 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.551&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.551&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.550&r2=1.551
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.550
retrieving revision 1.551
diff -u -r1.550 -r1.551
--- toolchain.eclass 11 Jun 2012 21:07:31 -0000 1.550
+++ toolchain.eclass 19 Aug 2012 01:23:44 -0000 1.551
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.550 2012/06/11 21:07:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.551 2012/08/19 01:23:44 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -893,6 +893,10 @@
fi
fi
+ # Enable build warnings by default with cross-compilers when system
+ # paths are included (e.g. via -I flags).
+ is_crosscompile && confgcc+=" --enable-poison-system-directories"
+
# For newer versions of gcc, use the default ("release"), because no
# one (even upstream apparently) tests with it disabled. #317217
if tc_version_is_at_least 4 || [[ -n ${GCC_CHECKS_LIST} ]] ; then
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2012-10-01 5:03 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2012-10-01 5:03 UTC (permalink / raw
To: gentoo-commits
vapier 12/10/01 05:03:17
Modified: toolchain.eclass
Log:
depend on virtual/pkgconfig for gcj/gtk deps #436724 by Diego Elio Pettenò
Revision Changes Path
1.552 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.552&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.552&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.551&r2=1.552
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.551
retrieving revision 1.552
diff -u -r1.551 -r1.552
--- toolchain.eclass 19 Aug 2012 01:23:44 -0000 1.551
+++ toolchain.eclass 1 Oct 2012 05:03:17 -0000 1.552
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.551 2012/08/19 01:23:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.552 2012/10/01 05:03:17 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -171,7 +171,9 @@
x11-libs/libXtst
x11-proto/xproto
x11-proto/xextproto
- =x11-libs/gtk+-2*"
+ =x11-libs/gtk+-2*
+ virtual/pkgconfig
+ "
tc_version_is_at_least 3.4 && GCJ_GTK_DEPS+=" x11-libs/pango"
GCJ_DEPS=">=media-libs/libart_lgpl-2.1"
tc_version_is_at_least 4.2 && GCJ_DEPS+=" app-arch/zip app-arch/unzip"
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2012-11-02 20:18 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2012-11-02 20:18 UTC (permalink / raw
To: gentoo-commits
vapier 12/11/02 20:18:11
Modified: toolchain.eclass
Log:
do not sed libstdc++ python dir with gcc-4.7+ since the issue has been fixed in those versions
Revision Changes Path
1.553 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.553&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.553&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.552&r2=1.553
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.552
retrieving revision 1.553
diff -u -r1.552 -r1.553
--- toolchain.eclass 1 Oct 2012 05:03:17 -0000 1.552
+++ toolchain.eclass 2 Nov 2012 20:18:11 -0000 1.553
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.552 2012/10/01 05:03:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.553 2012/11/02 20:18:11 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -711,7 +711,7 @@
# install the libstdc++ python into the right location
# http://gcc.gnu.org/PR51368
- if tc_version_is_at_least 4.5 ; then
+ if tc_version_is_at_least 4.5 && ! tc_version_is_at_least 4.7 ; then
sed -i \
'/^pythondir =/s:=.*:= $(datadir)/python:' \
"${S}"/libstdc++-v3/python/Makefile.in || die
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2012-11-19 2:59 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2012-11-19 2:59 UTC (permalink / raw
To: gentoo-commits
vapier 12/11/19 02:59:49
Modified: toolchain.eclass
Log:
set FCFLAGS/FFLAGS when cross-compiling
Revision Changes Path
1.554 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.554&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.554&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.553&r2=1.554
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.553
retrieving revision 1.554
diff -u -r1.553 -r1.554
--- toolchain.eclass 2 Nov 2012 20:18:11 -0000 1.553
+++ toolchain.eclass 19 Nov 2012 02:59:49 -0000 1.554
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.553 2012/11/02 20:18:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.554 2012/11/19 02:59:49 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1398,6 +1398,8 @@
if is_crosscompile ; then
# Set this to something sane for both native and target
CFLAGS="-O2 -pipe"
+ FFLAGS=${CFLAGS}
+ FCFLAGS=${CFLAGS}
local VAR="CFLAGS_"${CTARGET//-/_}
CXXFLAGS=${!VAR}
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2012-11-19 6:55 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2012-11-19 6:55 UTC (permalink / raw
To: gentoo-commits
vapier 12/11/19 06:55:44
Modified: toolchain.eclass
Log:
stop disabling multilib libjava #425154 #435728
Revision Changes Path
1.555 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.555&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.555&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.554&r2=1.555
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.554
retrieving revision 1.555
diff -u -r1.554 -r1.555
--- toolchain.eclass 19 Nov 2012 02:59:49 -0000 1.554
+++ toolchain.eclass 19 Nov 2012 06:55:44 -0000 1.555
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.554 2012/11/19 02:59:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.555 2012/11/19 06:55:44 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -180,7 +180,7 @@
DEPEND+=" gcj? ( gtk? ( ${GCJ_GTK_DEPS} ) ${GCJ_DEPS} )"
fi
-PDEPEND=">=sys-devel/gcc-config-1.5"
+PDEPEND=">=sys-devel/gcc-config-1.7"
#----<< DEPEND >>----
@@ -463,48 +463,47 @@
dodir /etc/env.d/gcc
local gcc_envd_base="/etc/env.d/gcc/${CTARGET}-${GCC_CONFIG_VER}"
+ local gcc_specs_file
+ local gcc_envd_file="${D}${gcc_envd_base}"
if [[ -z $1 ]] ; then
- gcc_envd_file="${D}${gcc_envd_base}"
# I'm leaving the following commented out to remind me that it
# was an insanely -bad- idea. Stuff broke. GCC_SPECS isnt unset
# on chroot or in non-toolchain.eclass gcc ebuilds!
#gcc_specs_file="${LIBPATH}/specs"
gcc_specs_file=""
else
- gcc_envd_file="${D}${gcc_envd_base}-$1"
+ gcc_envd_file+="-$1"
gcc_specs_file="${LIBPATH}/$1.specs"
fi
- # phase PATH/ROOTPATH out ...
- echo "PATH=\"${BINPATH}\"" > ${gcc_envd_file}
- echo "ROOTPATH=\"${BINPATH}\"" >> ${gcc_envd_file}
- echo "GCC_PATH=\"${BINPATH}\"" >> ${gcc_envd_file}
-
# We want to list the default ABI's LIBPATH first so libtool
# searches that directory first. This is a temporary
# workaround for libtool being stupid and using .la's from
# conflicting ABIs by using the first one in the search path
- local abi=${TARGET_DEFAULT_ABI}
- local MULTIDIR=$($(XGCC) $(get_abi_CFLAGS ${abi}) --print-multi-directory)
- local LDPATH=${LIBPATH}
- [[ ${MULTIDIR} != "." ]] && LDPATH+=/${MULTIDIR}
+ local mdir mosdir mosdirs abi
+ local ldpath ldpaths
for abi in $(get_all_abis TARGET) ; do
- [[ ${abi} == ${TARGET_DEFAULT_ABI} ]] && continue
+ mdir=$($(XGCC) $(get_abi_CFLAGS ${abi}) --print-multi-directory)
+ ldpath=${LIBPATH}
+ [[ ${mdir} != "." ]] && ldpath+="/${mdir}"
+ ldpaths="${ldpath}${ldpaths:+:${ldpaths}}"
- MULTIDIR=$($(XGCC) $(get_abi_CFLAGS ${abi}) --print-multi-directory)
- LDPATH+=:${LIBPATH}
- [[ ${MULTIDIR} != "." ]] && LDPATH+=/${MULTIDIR}
+ mosdir=$($(XGCC) $(get_abi_CFLAGS ${abi}) -print-multi-os-directory)
+ mosdirs="${mosdir}${mosdirs:+:${mosdirs}}"
done
- echo "LDPATH=\"${LDPATH}\"" >> ${gcc_envd_file}
- echo "MANPATH=\"${DATAPATH}/man\"" >> ${gcc_envd_file}
- echo "INFOPATH=\"${DATAPATH}/info\"" >> ${gcc_envd_file}
- echo "STDCXX_INCDIR=\"${STDCXX_INCDIR##*/}\"" >> ${gcc_envd_file}
-
- is_crosscompile && echo "CTARGET=${CTARGET}" >> ${gcc_envd_file}
-
- # Set which specs file to use
- [[ -n ${gcc_specs_file} ]] && echo "GCC_SPECS=\"${gcc_specs_file}\"" >> ${gcc_envd_file}
+ cat <<-EOF > ${gcc_envd_file}
+ PATH="${BINPATH}"
+ ROOTPATH="${BINPATH}"
+ GCC_PATH="${BINPATH}"
+ LDPATH="${ldpath}"
+ MANPATH="${DATAPATH}/man"
+ INFOPATH="${DATAPATH}/info"
+ STDCXX_INCDIR="${STDCXX_INCDIR##*/}"
+ CTARGET="${CTARGET}"
+ GCC_SPECS="${gcc_specs_file}"
+ MULTIOSDIRS="${mosdirs}"
+ EOF
}
setup_minispecs_gcc_build_specs() {
# Setup the "build.specs" file for gcc 4.3 to use when building.
@@ -717,6 +716,12 @@
"${S}"/libstdc++-v3/python/Makefile.in || die
fi
+ # make sure the pkg config files install into multilib dirs.
+ # since we configure with just one --libdir, we can't use that
+ # (as gcc itself takes care of building multilibs). #435728
+ find "${S}" -name Makefile.in \
+ -exec sed -i '/^pkgconfigdir/s:=.*:=$(toolexeclibdir)/pkgconfig:' {} +
+
# No idea when this first started being fixed, but let's go with 4.3.x for now
if ! tc_version_is_at_least 4.3 ; then
fix_files=""
@@ -793,8 +798,6 @@
einfo " ${f%%...}"
done
fi
-
- disable_multilib_libjava || die "failed to disable multilib java"
}
gcc-abi-map() {
@@ -1622,13 +1625,6 @@
[[ -f ${x} ]] && mv -f "${x}" "${D}"${LIBPATH}/
done
- # SLOT up libgcj.pc if it's available (and let gcc-config worry about links)
- for x in "${D}"${PREFIX}/lib*/pkgconfig/libgcj*.pc ; do
- [[ -f ${x} ]] || continue
- sed -i "/^libdir=/s:=.*:=${LIBPATH}:" "${x}"
- mv "${x}" "${D}"/usr/lib/pkgconfig/libgcj-${GCC_PV}.pc || die
- done
-
# Rename jar because it could clash with Kaffe's jar if this gcc is
# primary compiler (aka don't have the -<version> extension)
cd "${D}"${BINPATH}
@@ -1642,7 +1638,7 @@
# older versions of gcc did not support --print-multi-os-directory
tc_version_is_at_least 3.0 || return 0
- local multiarg removedirs=""
+ local x multiarg removedirs=""
for multiarg in $($(XGCC) -print-multi-lib) ; do
multiarg=${multiarg#*;}
multiarg=${multiarg//@/ -}
@@ -1670,6 +1666,14 @@
fi
done
fix_libtool_libdir_paths "${LIBPATH}/${MULTIDIR}"
+
+ # SLOT up libgcj.pc if it's available (and let gcc-config worry about links)
+ FROMDIR="${PREFIX}/lib/${OS_MULTIDIR}"
+ for x in "${D}${FROMDIR}"/pkgconfig/libgcj*.pc ; do
+ [[ -f ${x} ]] || continue
+ sed -i "/^libdir=/s:=.*:=${LIBPATH}/${MULTIDIR}:" "${x}"
+ mv "${x}" "${D}${FROMDIR}"/pkgconfig/libgcj-${GCC_PV}.pc || die
+ done
done
# We remove directories separately to avoid this case:
@@ -1938,18 +1942,6 @@
sed -i "$@" "${S}"/gcc/config/${config} || die
}
-disable_multilib_libjava() {
- # We dont want a multilib libjava, so lets use this hack taken from fedora
- sed -i -r \
- -e 's/^((all:) all-redirect)/ifeq (\$(MULTISUBDIR),)\n\1\nelse\n\2\n\techo Multilib libjava disabled\nendif/' \
- -e 's/^((install:) install-redirect)/ifeq (\$(MULTISUBDIR),)\n\1\nelse\n\2\n\techo Multilib libjava disabled\nendif/' \
- -e 's/^((check:) check-redirect)/ifeq (\$(MULTISUBDIR),)\n\1\nelse\n\2\n\techo Multilib libjava disabled\nendif/' \
- -e 's/^((all:) all-recursive)/ifeq (\$(MULTISUBDIR),)\n\1\nelse\n\2\n\techo Multilib libjava disabled\nendif/' \
- -e 's/^((install:) install-recursive)/ifeq (\$(MULTISUBDIR),)\n\1\nelse\n\2\n\techo Multilib libjava disabled\nendif/' \
- -e 's/^((check:) check-recursive)/ifeq (\$(MULTISUBDIR),)\n\1\nelse\n\2\n\techo Multilib libjava disabled\nendif/' \
- "${S}"/libjava/Makefile.in || die
-}
-
# make sure the libtool archives have libdir set to where they actually
# -are-, and not where they -used- to be. also, any dependencies we have
# on our own .la files need to be updated.
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2012-11-22 5:19 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2012-11-22 5:19 UTC (permalink / raw
To: gentoo-commits
vapier 12/11/22 05:19:37
Modified: toolchain.eclass
Log:
drop USE=nocxx support since everyone should be migrated now
Revision Changes Path
1.556 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.556&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.556&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.555&r2=1.556
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.555
retrieving revision 1.556
diff -u -r1.555 -r1.556
--- toolchain.eclass 19 Nov 2012 06:55:44 -0000 1.555
+++ toolchain.eclass 22 Nov 2012 05:19:37 -0000 1.556
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.555 2012/11/19 06:55:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.556 2012/11/22 05:19:37 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -100,7 +100,7 @@
IUSE="build multislot nls nptl test vanilla"
if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then
- IUSE+=" altivec cxx fortran nocxx"
+ IUSE+=" altivec cxx fortran"
[[ -n ${PIE_VER} ]] && IUSE+=" nopie"
[[ -n ${HTB_VER} ]] && IUSE+=" boundschecking"
[[ -n ${D_VER} ]] && IUSE+=" d"
@@ -1022,15 +1022,6 @@
gcc_do_configure() {
local confgcc
- # Sanity check for USE=nocxx -> USE=cxx migration
- if in_iuse cxx && in_iuse nocxx ; then
- if (use cxx && use nocxx) || (use !cxx && use !nocxx) ; then
- eerror "We are migrating USE=nocxx to USE=cxx, but your USE settings do not make"
- eerror "sense. Please make sure these two flags line up logically in your setup."
- die "USE='cxx nocxx' and USE='-cxx -nocxx' make no sense"
- fi
- fi
-
# Set configuration based on path variables
confgcc+=" \
--prefix=${PREFIX} \
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2012-11-22 6:16 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2012-11-22 6:16 UTC (permalink / raw
To: gentoo-commits
vapier 12/11/22 06:16:11
Modified: toolchain.eclass
Log:
fix typo in env.d generation after recent rewrite so we store all ldpaths and not just the last one #444193 by Robert Cernansky
Revision Changes Path
1.557 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.557&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.557&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.556&r2=1.557
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.556
retrieving revision 1.557
diff -u -r1.556 -r1.557
--- toolchain.eclass 22 Nov 2012 05:19:37 -0000 1.556
+++ toolchain.eclass 22 Nov 2012 06:16:11 -0000 1.557
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.556 2012/11/22 05:19:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.557 2012/11/22 06:16:11 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -496,7 +496,7 @@
PATH="${BINPATH}"
ROOTPATH="${BINPATH}"
GCC_PATH="${BINPATH}"
- LDPATH="${ldpath}"
+ LDPATH="${ldpaths}"
MANPATH="${DATAPATH}/man"
INFOPATH="${DATAPATH}/info"
STDCXX_INCDIR="${STDCXX_INCDIR##*/}"
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2012-11-24 21:20 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2012-11-24 21:20 UTC (permalink / raw
To: gentoo-commits
vapier 12/11/24 21:20:02
Modified: toolchain.eclass
Log:
depend on gtk/x emul packages when USE="amd64 multilib gcj gtk" #444350 by David Kredba
Revision Changes Path
1.558 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.558&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.558&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.557&r2=1.558
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.557
retrieving revision 1.558
diff -u -r1.557 -r1.558
--- toolchain.eclass 22 Nov 2012 06:16:11 -0000 1.557
+++ toolchain.eclass 24 Nov 2012 21:20:02 -0000 1.558
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.557 2012/11/22 06:16:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.558 2012/11/24 21:20:02 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -173,6 +173,10 @@
x11-proto/xextproto
=x11-libs/gtk+-2*
virtual/pkgconfig
+ amd64? ( multilib? (
+ app-emulation/emul-linux-x86-gtklibs
+ app-emulation/emul-linux-x86-xlibs
+ ) )
"
tc_version_is_at_least 3.4 && GCJ_GTK_DEPS+=" x11-libs/pango"
GCJ_DEPS=">=media-libs/libart_lgpl-2.1"
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2012-11-24 22:27 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2012-11-24 22:27 UTC (permalink / raw
To: gentoo-commits
vapier 12/11/24 22:27:06
Modified: toolchain.eclass
Log:
if uClibc is built w/out shared lib support (like nommu), then pass in --disable-shared #291870 by Petric Frank
Revision Changes Path
1.559 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.559&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.559&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.558&r2=1.559
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.558
retrieving revision 1.559
diff -u -r1.558 -r1.559
--- toolchain.eclass 24 Nov 2012 21:20:02 -0000 1.558
+++ toolchain.eclass 24 Nov 2012 22:27:06 -0000 1.559
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.558 2012/11/24 21:20:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.559 2012/11/24 22:27:06 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1125,7 +1125,15 @@
*-freebsd*) needed_libc=freebsd-lib;;
*-gnu*) needed_libc=glibc;;
*-klibc) needed_libc=klibc;;
- *-uclibc*) needed_libc=uclibc;;
+ *-uclibc*)
+ if ! echo '#include <features.h>' | \
+ $(tc-getCPP ${CTARGET}) -E -dD - 2>/dev/null | \
+ grep -q __HAVE_SHARED__
+ then #291870
+ confgcc+=" --disable-shared"
+ fi
+ needed_libc=uclibc
+ ;;
*-cygwin) needed_libc=cygwin;;
x86_64-*-mingw*|\
*-w64-mingw*) needed_libc=mingw64-runtime;;
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2012-11-29 1:16 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2012-11-29 1:16 UTC (permalink / raw
To: gentoo-commits
vapier 12/11/29 01:16:41
Modified: toolchain.eclass
Log:
disable X configure flags setting up bad -I/-L flags that will mess with multilib builds that need 3rd party libs (such as libjava and gtk/etc...)
Revision Changes Path
1.560 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.560&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.560&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.559&r2=1.560
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.559
retrieving revision 1.560
diff -u -r1.559 -r1.560
--- toolchain.eclass 24 Nov 2012 22:27:06 -0000 1.559
+++ toolchain.eclass 29 Nov 2012 01:16:41 -0000 1.560
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.559 2012/11/24 22:27:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.560 2012/11/29 01:16:41 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1204,6 +1204,12 @@
--with-pkgversion="${BRANDING_GCC_PKGVERSION}"
set -- ${confgcc} "$@" ${EXTRA_ECONF}
+ # Do not let the X detection get in our way. We know things can be found
+ # via system paths, so no need to hardcode things that'll break multilib.
+ # Older gcc versions will detect ac_x_libraries=/usr/lib64 which ends up
+ # killing the 32bit builds which want /usr/lib.
+ export ac_cv_have_x='have_x=yes ac_x_includes= ac_x_libraries='
+
# Nothing wrong with a good dose of verbosity
echo
einfo "PREFIX: ${PREFIX}"
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2012-12-24 4:20 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2012-12-24 4:20 UTC (permalink / raw
To: gentoo-commits
vapier 12/12/24 04:20:08
Modified: toolchain.eclass
Log:
pass --enable-libstdcxx-time so that it tries to locate support in the C lib -- if it does not find it, it will skip support like normal and not fail or fall back to -lrt #411681
Revision Changes Path
1.561 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.561&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.561&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.560&r2=1.561
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.560
retrieving revision 1.561
diff -u -r1.560 -r1.561
--- toolchain.eclass 29 Nov 2012 01:16:41 -0000 1.560
+++ toolchain.eclass 24 Dec 2012 04:20:08 -0000 1.561
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.560 2012/11/29 01:16:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.561 2012/12/24 04:20:08 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -923,6 +923,13 @@
confgcc+=" --enable-java-awt=gtk"
fi
+ # allow gcc to search for clock funcs in the main C lib.
+ # if it can't find them, then tough cookies -- we aren't
+ # going to link in -lrt to all C++ apps. #411681
+ if tc_version_is_at_least 4.4 && is_cxx ; then
+ confgcc+=" --enable-libstdcxx-time"
+ fi
+
# newer gcc versions like to bootstrap themselves with C++,
# so we need to manually disable it ourselves
if tc_version_is_at_least 4.7 && ! is_cxx ; then
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2012-12-24 4:56 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2012-12-24 4:56 UTC (permalink / raw
To: gentoo-commits
vapier 12/12/24 04:56:29
Modified: toolchain.eclass
Log:
do not mention active gcc-config if we are removing a version that is not selected #446830
Revision Changes Path
1.562 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.562&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.562&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.561&r2=1.562
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.561
retrieving revision 1.562
diff -u -r1.561 -r1.562
--- toolchain.eclass 24 Dec 2012 04:20:08 -0000 1.561
+++ toolchain.eclass 24 Dec 2012 04:56:29 -0000 1.562
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.561 2012/12/24 04:20:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.562 2012/12/24 04:56:29 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1850,15 +1850,18 @@
# We don't want to switch from say gcc-3.3 to gcc-3.4 right in
# the middle of an emerge operation (like an 'emerge -e world'
# which could install multiple gcc versions).
- einfo "The current gcc config appears valid, so it will not be"
- einfo "automatically switched for you. If you would like to"
- einfo "switch to the newly installed gcc version, do the"
- einfo "following:"
- echo
- einfo "gcc-config ${CTARGET}-${GCC_CONFIG_VER}"
- einfo "source /etc/profile"
- echo
- ebeep
+ # Only warn if we're installing a pkg as we might be called from
+ # the pkg_{pre,post}rm steps. #446830
+ if [[ ${EBUILD_PHASE} == *"inst" ]] ; then
+ einfo "The current gcc config appears valid, so it will not be"
+ einfo "automatically switched for you. If you would like to"
+ einfo "switch to the newly installed gcc version, do the"
+ einfo "following:"
+ echo
+ einfo "gcc-config ${CTARGET}-${GCC_CONFIG_VER}"
+ einfo "source /etc/profile"
+ echo
+ fi
return 1
fi
}
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2012-12-29 6:08 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2012-12-29 6:08 UTC (permalink / raw
To: gentoo-commits
vapier 12/12/29 06:08:51
Modified: toolchain.eclass
Log:
restrict multilib logic in a few more places to gcc-3.2+, and libstdc++-v3 to gcc-3+
Revision Changes Path
1.563 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.563&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.563&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.562&r2=1.563
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.562
retrieving revision 1.563
diff -u -r1.562 -r1.563
--- toolchain.eclass 24 Dec 2012 04:56:29 -0000 1.562
+++ toolchain.eclass 29 Dec 2012 06:08:51 -0000 1.563
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.562 2012/12/24 04:56:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.563 2012/12/29 06:08:51 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -484,17 +484,22 @@
# searches that directory first. This is a temporary
# workaround for libtool being stupid and using .la's from
# conflicting ABIs by using the first one in the search path
- local mdir mosdir mosdirs abi
- local ldpath ldpaths
- for abi in $(get_all_abis TARGET) ; do
- mdir=$($(XGCC) $(get_abi_CFLAGS ${abi}) --print-multi-directory)
- ldpath=${LIBPATH}
- [[ ${mdir} != "." ]] && ldpath+="/${mdir}"
- ldpaths="${ldpath}${ldpaths:+:${ldpaths}}"
+ local ldpaths mosdirs
+ if tc_version_is_at_least 3.2 ; then
+ local mdir mosdir abi ldpath
+ for abi in $(get_all_abis TARGET) ; do
+ mdir=$($(XGCC) $(get_abi_CFLAGS ${abi}) --print-multi-directory)
+ ldpath=${LIBPATH}
+ [[ ${mdir} != "." ]] && ldpath+="/${mdir}"
+ ldpaths="${ldpath}${ldpaths:+:${ldpaths}}"
- mosdir=$($(XGCC) $(get_abi_CFLAGS ${abi}) -print-multi-os-directory)
- mosdirs="${mosdir}${mosdirs:+:${mosdirs}}"
- done
+ mosdir=$($(XGCC) $(get_abi_CFLAGS ${abi}) -print-multi-os-directory)
+ mosdirs="${mosdir}${mosdirs:+:${mosdirs}}"
+ done
+ else
+ # Older gcc's didn't do multilib, so logic is simple.
+ ldpaths=${LIBPATH}
+ fi
cat <<-EOF > ${gcc_envd_file}
PATH="${BINPATH}"
@@ -1547,11 +1552,13 @@
rm -rf "${D}"/usr/share/{man,info}
rm -rf "${D}"${DATAPATH}/{man,info}
else
- 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/
+ 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
has noinfo ${FEATURES} \
&& rm -r "${D}/${DATAPATH}"/info \
@@ -1652,7 +1659,7 @@
# instead of the private gcc lib path
gcc_movelibs() {
# older versions of gcc did not support --print-multi-os-directory
- tc_version_is_at_least 3.0 || return 0
+ tc_version_is_at_least 3.2 || return 0
local x multiarg removedirs=""
for multiarg in $($(XGCC) -print-multi-lib) ; do
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2012-12-29 6:41 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2012-12-29 6:41 UTC (permalink / raw
To: gentoo-commits
vapier 12/12/29 06:41:15
Modified: toolchain.eclass
Log:
only mess with libffi stuff with gcc-3.1+
Revision Changes Path
1.564 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.564&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.564&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.563&r2=1.564
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.563
retrieving revision 1.564
diff -u -r1.563 -r1.564
--- toolchain.eclass 29 Dec 2012 06:08:51 -0000 1.563
+++ toolchain.eclass 29 Dec 2012 06:41:15 -0000 1.564
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.563 2012/12/29 06:08:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.564 2012/12/29 06:41:15 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -779,8 +779,10 @@
fi
# Prevent libffi from being installed
- sed -i -e 's/\(install.*:\) install-.*recursive/\1/' "${S}"/libffi/Makefile.in
- sed -i -e 's/\(install-data-am:\).*/\1/' "${S}"/libffi/include/Makefile.in
+ if tc_version_is_at_least 3.1 ; then
+ sed -i -e 's/\(install.*:\) install-.*recursive/\1/' "${S}"/libffi/Makefile.in || die
+ sed -i -e 's/\(install-data-am:\).*/\1/' "${S}"/libffi/include/Makefile.in || die
+ fi
# Fixup libtool to correctly generate .la files with portage
cd "${S}"
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2012-12-29 6:44 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2012-12-29 6:44 UTC (permalink / raw
To: gentoo-commits
vapier 12/12/29 06:44:03
Modified: toolchain.eclass
Log:
change `use doc` to `use_if_iuse doc` since not all gcc versions have USE=doc
Revision Changes Path
1.565 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.565&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.565&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.564&r2=1.565
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.564
retrieving revision 1.565
diff -u -r1.564 -r1.565
--- toolchain.eclass 29 Dec 2012 06:41:15 -0000 1.564
+++ toolchain.eclass 29 Dec 2012 06:44:03 -0000 1.565
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.564 2012/12/29 06:41:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.565 2012/12/29 06:44:03 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1332,7 +1332,7 @@
${GCC_MAKE_TARGET} \
|| die "emake failed with ${GCC_MAKE_TARGET}"
- if ! is_crosscompile && use cxx && use doc ; then
+ if ! is_crosscompile && use cxx && use_if_iuse doc ; then
if type -p doxygen > /dev/null ; then
if tc_version_is_at_least 4.3 ; then
cd "${CTARGET}"/libstdc++-v3/doc
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2012-12-29 6:45 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2012-12-29 6:45 UTC (permalink / raw
To: gentoo-commits
vapier 12/12/29 06:45:06
Modified: toolchain.eclass
Log:
enable libffi with gcc-3.0+ (i did not have a local copy at the time to check against)
Revision Changes Path
1.566 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.566&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.566&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.565&r2=1.566
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.565
retrieving revision 1.566
diff -u -r1.565 -r1.566
--- toolchain.eclass 29 Dec 2012 06:44:03 -0000 1.565
+++ toolchain.eclass 29 Dec 2012 06:45:06 -0000 1.566
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.565 2012/12/29 06:44:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.566 2012/12/29 06:45:06 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -779,7 +779,7 @@
fi
# Prevent libffi from being installed
- if tc_version_is_at_least 3.1 ; then
+ if tc_version_is_at_least 3.0 ; then
sed -i -e 's/\(install.*:\) install-.*recursive/\1/' "${S}"/libffi/Makefile.in || die
sed -i -e 's/\(install-data-am:\).*/\1/' "${S}"/libffi/include/Makefile.in || die
fi
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2013-01-24 1:27 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2013-01-24 1:27 UTC (permalink / raw
To: gentoo-commits
vapier 13/01/24 01:27:28
Modified: toolchain.eclass
Log:
drop USE="bootstrap build" as it does very little and the existing logic should handle things correctly #440224
Revision Changes Path
1.568 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.568&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.568&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.567&r2=1.568
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.567
retrieving revision 1.568
diff -u -r1.567 -r1.568
--- toolchain.eclass 15 Jan 2013 02:30:53 -0000 1.567
+++ toolchain.eclass 24 Jan 2013 01:27:27 -0000 1.568
@@ -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.eclass,v 1.567 2013/01/15 02:30:53 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.568 2013/01/24 01:27:27 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -97,7 +97,7 @@
#---->> SLOT+IUSE logic <<----
-IUSE="build multislot nls nptl test vanilla"
+IUSE="multislot nls nptl test vanilla"
if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then
IUSE+=" altivec cxx fortran"
@@ -107,7 +107,7 @@
[[ -n ${SPECS_VER} ]] && IUSE+=" nossp"
if tc_version_is_at_least 3 ; then
- IUSE+=" bootstrap doc gcj gtk hardened multilib objc"
+ IUSE+=" doc gcj gtk hardened multilib objc"
tc_version_is_at_least "4.0" && IUSE+=" objc-gc mudflap"
tc_version_is_at_least "4.1" && IUSE+=" libssp objc++"
@@ -130,9 +130,7 @@
#---->> DEPEND <<----
RDEPEND="sys-libs/zlib
- !build? (
- nls? ( sys-devel/gettext )
- )"
+ nls? ( sys-devel/gettext )"
if tc_version_is_at_least 3 ; then
RDEPEND+=" virtual/libiconv"
fi
@@ -1812,7 +1810,7 @@
EPATCH_MULTI_MSG="Applying default pie patches ..." \
epatch "${WORKDIR}"/piepatch/def
fi
-
+
# we want to be able to control the pie patch logic via something other
# than ALL_CFLAGS...
sed -e '/^ALL_CFLAGS/iHARD_CFLAGS = ' \
@@ -1829,11 +1827,6 @@
}
should_we_gcc_config() {
- # we always want to run gcc-config if we're bootstrapping, otherwise
- # we might get stuck with the c-only stage1 compiler
- use_if_iuse bootstrap && return 0
- use build && return 0
-
# if the current config is invalid, we definitely want a new one
# Note: due to bash quirkiness, the following must not be 1 line
local curr_config
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2013-02-09 4:34 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2013-02-09 4:34 UTC (permalink / raw
To: gentoo-commits
vapier 13/02/09 04:34:32
Modified: toolchain.eclass
Log:
update snapshot location to use gcc.gnu.org #455152
Revision Changes Path
1.569 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.569&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.569&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.568&r2=1.569
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.568
retrieving revision 1.569
diff -u -r1.568 -r1.569
--- toolchain.eclass 24 Jan 2013 01:27:27 -0000 1.568
+++ toolchain.eclass 9 Feb 2013 04:34:32 -0000 1.569
@@ -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.eclass,v 1.568 2013/01/24 01:27:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.569 2013/02/09 04:34:32 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -209,11 +209,10 @@
# can be altered by setting the following:
#
# SNAPSHOT
-# If set, this variable signals that we should be using a snapshot
-# of gcc from ftp://sources.redhat.com/pub/gcc/snapshots/. It is
-# expected to be in the format "YYYY-MM-DD". Note that if the ebuild
-# has a _pre suffix, this variable is ignored and the prerelease
-# tarball is used instead.
+# If set, this variable signals that we should be using a snapshot of
+# gcc. It is expected to be in the format "YYYY-MM-DD". Note that if
+# the ebuild has a _pre suffix, this variable is ignored and the
+# prerelease tarball is used instead.
#
# BRANCH_UPDATE
# If set, this variable signals that we should be using the main
@@ -279,7 +278,7 @@
if [[ -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://sources.redhat.com/pub/gcc/snapshots/${SNAPSHOT}/gcc-${SNAPSHOT}.tar.bz2"
+ GCC_SRC_URI="ftp://gcc.gnu.org/pub/gcc/snapshots/${SNAPSHOT}/gcc-${SNAPSHOT}.tar.bz2"
elif [[ ${PV} != *9999* ]] ; then
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
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2013-04-01 7:59 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2013-04-01 7:59 UTC (permalink / raw
To: gentoo-commits
vapier 13/04/01 07:59:05
Modified: toolchain.eclass
Log:
drop --enable-target-optspace for uClibc targets ... there is no real need for this, and if people want to build with -Os, they can. this also avoids build failures on ppc (PR43810).
Revision Changes Path
1.571 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.571&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.571&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.570&r2=1.571
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.570
retrieving revision 1.571
diff -u -r1.570 -r1.571
--- toolchain.eclass 16 Mar 2013 05:44:49 -0000 1.570
+++ toolchain.eclass 1 Apr 2013 07:59:05 -0000 1.571
@@ -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.eclass,v 1.570 2013/03/16 05:44:49 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.571 2013/04/01 07:59:05 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1192,7 +1192,7 @@
# destructors", but apparently requires glibc.
case ${CTARGET} in
*-uclibc*)
- confgcc+=" --disable-__cxa_atexit --enable-target-optspace $(use_enable nptl tls)"
+ confgcc+=" --disable-__cxa_atexit $(use_enable nptl tls)"
[[ ${GCCMAJOR}.${GCCMINOR} == 3.3 ]] && confgcc+=" --enable-sjlj-exceptions"
if tc_version_is_at_least 3.4 && ! tc_version_is_at_least 4.3 ; then
confgcc+=" --enable-clocale=uclibc"
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2013-04-01 8:00 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2013-04-01 8:00 UTC (permalink / raw
To: gentoo-commits
vapier 13/04/01 08:00:05
Modified: toolchain.eclass
Log:
avoid regenerating info pages due to changed version/bugurl fields #464008
Revision Changes Path
1.572 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.572&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.572&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.571&r2=1.572
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.571
retrieving revision 1.572
diff -u -r1.571 -r1.572
--- toolchain.eclass 1 Apr 2013 07:59:05 -0000 1.571
+++ toolchain.eclass 1 Apr 2013 08:00:05 -0000 1.572
@@ -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.eclass,v 1.571 2013/04/01 07:59:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.572 2013/04/01 08:00:05 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -163,7 +163,6 @@
fi
DEPEND="${RDEPEND}
- >=sys-apps/texinfo-4.8
>=sys-devel/bison-1.875
>=sys-devel/flex-2.5.4
test? (
@@ -795,6 +794,10 @@
gnuconfig_update
+ # keep info pages from regenerating due to our custom version/bug url
+ # settings. there's no real gain from doing so, but there is pain. #464008
+ touch -r . gcc/gcc-vers.texi
+
# update configure files
local f
einfo "Fixing misc issues in configure files"
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2013-04-02 3:02 Ryan Hill (dirtyepic)
0 siblings, 0 replies; 266+ messages in thread
From: Ryan Hill (dirtyepic) @ 2013-04-02 3:02 UTC (permalink / raw
To: gentoo-commits
dirtyepic 13/04/02 03:02:22
Modified: toolchain.eclass
Log:
Revert previous due to breakage.
Revision Changes Path
1.573 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.573&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.573&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.572&r2=1.573
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.572
retrieving revision 1.573
diff -u -r1.572 -r1.573
--- toolchain.eclass 1 Apr 2013 08:00:05 -0000 1.572
+++ toolchain.eclass 2 Apr 2013 03:02:22 -0000 1.573
@@ -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.eclass,v 1.572 2013/04/01 08:00:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.573 2013/04/02 03:02:22 dirtyepic Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -794,10 +794,6 @@
gnuconfig_update
- # keep info pages from regenerating due to our custom version/bug url
- # settings. there's no real gain from doing so, but there is pain. #464008
- touch -r . gcc/gcc-vers.texi
-
# update configure files
local f
einfo "Fixing misc issues in configure files"
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2013-04-06 3:47 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2013-04-06 3:47 UTC (permalink / raw
To: gentoo-commits
vapier 13/04/06 03:47:30
Modified: toolchain.eclass
Log:
disable info page generation since gcc includes generated pages already #464008 by Max Steel
Revision Changes Path
1.575 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.575&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.575&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.574&r2=1.575
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.574
retrieving revision 1.575
diff -u -r1.574 -r1.575
--- toolchain.eclass 5 Apr 2013 05:23:22 -0000 1.574
+++ toolchain.eclass 6 Apr 2013 03:47:30 -0000 1.575
@@ -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.eclass,v 1.574 2013/04/05 05:23:22 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.575 2013/04/06 03:47:30 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1227,6 +1227,10 @@
--with-pkgversion="${BRANDING_GCC_PKGVERSION}"
set -- ${confgcc} "$@" ${EXTRA_ECONF}
+ # 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
+
# Do not let the X detection get in our way. We know things can be found
# via system paths, so no need to hardcode things that'll break multilib.
# Older gcc versions will detect ac_x_libraries=/usr/lib64 which ends up
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2013-04-07 8:51 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2013-04-07 8:51 UTC (permalink / raw
To: gentoo-commits
vapier 13/04/07 08:51:25
Modified: toolchain.eclass
Log:
make sure we install the info pages after we disabled generation #464008
Revision Changes Path
1.576 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.576&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.576&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.575&r2=1.576
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.575
retrieving revision 1.576
diff -u -r1.575 -r1.576
--- toolchain.eclass 6 Apr 2013 03:47:30 -0000 1.575
+++ toolchain.eclass 7 Apr 2013 08:51:25 -0000 1.576
@@ -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.eclass,v 1.575 2013/04/06 03:47:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.576 2013/04/07 08:51:25 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1496,6 +1496,9 @@
cd "${WORKDIR}"/build
# Do allow symlinks in private gcc include dir as this can break the build
find gcc/include*/ -type l -print0 | xargs -0 rm -f
+ # 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
+ cp "${S}"/gcc/doc/*.info gcc/doc/ || die
# Remove generated headers, as they can cause things to break
# (ncurses, openssl, etc).
for x in $(find gcc/include*/ -name '*.h') ; do
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2013-04-07 8:56 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2013-04-07 8:56 UTC (permalink / raw
To: gentoo-commits
vapier 13/04/07 08:56:52
Modified: toolchain.eclass
Log:
use simpler find statements
Revision Changes Path
1.577 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.577&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.577&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.576&r2=1.577
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.576
retrieving revision 1.577
diff -u -r1.576 -r1.577
--- toolchain.eclass 7 Apr 2013 08:51:25 -0000 1.576
+++ toolchain.eclass 7 Apr 2013 08:56:52 -0000 1.577
@@ -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.eclass,v 1.576 2013/04/07 08:51:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.577 2013/04/07 08:56:52 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1495,23 +1495,23 @@
cd "${WORKDIR}"/build
# Do allow symlinks in private gcc include dir as this can break the build
- find gcc/include*/ -type l -print0 | xargs -0 rm -f
+ 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
cp "${S}"/gcc/doc/*.info gcc/doc/ || die
# Remove generated headers, as they can cause things to break
# (ncurses, openssl, etc).
- for x in $(find gcc/include*/ -name '*.h') ; do
+ while read x ; do
grep -q 'It has been auto-edited by fixincludes from' "${x}" \
&& rm -f "${x}"
- done
+ done < <(find gcc/include*/ -name '*.h')
# Do the 'make install' from the build directory
S=${WORKDIR}/build \
emake -j1 DESTDIR="${D}" install || die
# Punt some tools which are really only useful while building gcc
find "${D}" -name install-tools -prune -type d -exec rm -rf "{}" \;
# This one comes with binutils
- find "${D}" -name libiberty.a -exec rm -f "{}" \;
+ find "${D}" -name libiberty.a -delete
# Move the libraries to the proper location
gcc_movelibs
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2013-04-07 18:27 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2013-04-07 18:27 UTC (permalink / raw
To: gentoo-commits
vapier 13/04/07 18:27:18
Modified: toolchain.eclass
Log:
make sure gcc/doc/ in the output exists, and copy all info files #464008
Revision Changes Path
1.578 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.578&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.578&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.577&r2=1.578
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.577
retrieving revision 1.578
diff -u -r1.577 -r1.578
--- toolchain.eclass 7 Apr 2013 08:56:52 -0000 1.577
+++ toolchain.eclass 7 Apr 2013 18:27:18 -0000 1.578
@@ -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.eclass,v 1.577 2013/04/07 08:56:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.578 2013/04/07 18:27:18 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1498,7 +1498,8 @@
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
- cp "${S}"/gcc/doc/*.info gcc/doc/ || die
+ mkdir -p gcc/doc
+ cp "${S}"/gcc/doc/*.info* gcc/doc/ || die
# Remove generated headers, as they can cause things to break
# (ncurses, openssl, etc).
while read x ; do
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2013-04-08 6:19 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2013-04-08 6:19 UTC (permalink / raw
To: gentoo-commits
vapier 13/04/08 06:19:00
Modified: toolchain.eclass
Log:
fix S clobbering that is not needed anymore to unbreak info page installs #464008
Revision Changes Path
1.580 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.580&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.580&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.579&r2=1.580
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.579
retrieving revision 1.580
diff -u -r1.579 -r1.580
--- toolchain.eclass 8 Apr 2013 03:37:07 -0000 1.579
+++ toolchain.eclass 8 Apr 2013 06:19:00 -0000 1.580
@@ -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.eclass,v 1.579 2013/04/08 03:37:07 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.580 2013/04/08 06:19:00 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1293,10 +1293,6 @@
# Travis Tilley <lv@gentoo.org> (04 Sep 2004)
#
gcc_do_make() {
- # Fix for libtool-portage.patch
- local OLDS=${S}
- S=${WORKDIR}/build
-
# Set make target to $1 if passed
[[ -n $1 ]] && GCC_MAKE_TARGET=$1
# default target
@@ -1335,7 +1331,7 @@
BOOT_CFLAGS=${BOOT_CFLAGS-"$(get_abi_CFLAGS ${TARGET_DEFAULT_ABI}) ${CFLAGS}"}
fi
- pushd "${WORKDIR}"/build
+ pushd "${WORKDIR}"/build >/dev/null
emake \
LDFLAGS="${LDFLAGS}" \
@@ -1359,7 +1355,7 @@
fi
fi
- popd
+ popd >/dev/null
}
# This is mostly a stub function to be overwritten in an ebuild
@@ -1499,7 +1495,7 @@
# 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
- cp "${WORKDIR}/${P}"/gcc/doc/*.info* gcc/doc/ || die
+ cp "${S}"/gcc/doc/*.info* gcc/doc/ || die
# Remove generated headers, as they can cause things to break
# (ncurses, openssl, etc).
while read x ; do
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2013-04-10 19:16 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2013-04-10 19:16 UTC (permalink / raw
To: gentoo-commits
vapier 13/04/10 19:16:41
Modified: toolchain.eclass
Log:
handle new gcc-4.8 MULTILIB_OSDIRNAMES logic that includes multiarch junk
Revision Changes Path
1.581 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.581&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.581&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.580&r2=1.581
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.580
retrieving revision 1.581
diff -u -r1.580 -r1.581
--- toolchain.eclass 8 Apr 2013 06:19:00 -0000 1.580
+++ toolchain.eclass 10 Apr 2013 19:16:41 -0000 1.581
@@ -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.eclass,v 1.580 2013/04/08 06:19:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.581 2013/04/10 19:16:41 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1969,18 +1969,22 @@
esac
config+="/t-linux64"
+ local sed_args=()
+ if tc_version_is_at_least 4.8 ; then
+ sed_args+=( -e 's:$[(]call if_multiarch[^)]*[)]::g' )
+ fi
if [[ ${SYMLINK_LIB} == "yes" ]] ; then
einfo "updating multilib directories to be: ${libdirs}"
if tc_version_is_at_least 4.7 ; then
- set -- -e '/^MULTILIB_OSDIRNAMES.*lib32/s:[$][(]if.*):../lib32:'
+ sed_args+=( -e '/^MULTILIB_OSDIRNAMES.*lib32/s:[$][(]if.*):../lib32:' )
else
- set -- -e "/^MULTILIB_OSDIRNAMES/s:=.*:= ${libdirs}:"
+ sed_args+=( -e "/^MULTILIB_OSDIRNAMES/s:=.*:= ${libdirs}:" )
fi
else
einfo "using upstream multilib; disabling lib32 autodetection"
- set -- -r -e 's:[$][(]if.*,(.*)[)]:\1:'
+ sed_args+=( -r -e 's:[$][(]if.*,(.*)[)]:\1:' )
fi
- sed -i "$@" "${S}"/gcc/config/${config} || die
+ sed -i "${sed_args[@]}" "${S}"/gcc/config/${config} || die
}
# make sure the libtool archives have libdir set to where they actually
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2013-04-17 2:12 Ryan Hill (dirtyepic)
0 siblings, 0 replies; 266+ messages in thread
From: Ryan Hill (dirtyepic) @ 2013-04-17 2:12 UTC (permalink / raw
To: gentoo-commits
dirtyepic 13/04/17 02:12:36
Modified: toolchain.eclass
Log:
Multiarch got backported to 4.6/4.7. 4.6.4 will be handled by patch since things are even more broken there.
Revision Changes Path
1.582 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.582&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.582&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.581&r2=1.582
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.581
retrieving revision 1.582
diff -u -r1.581 -r1.582
--- toolchain.eclass 10 Apr 2013 19:16:41 -0000 1.581
+++ toolchain.eclass 17 Apr 2013 02:12:36 -0000 1.582
@@ -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.eclass,v 1.581 2013/04/10 19:16:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.582 2013/04/17 02:12:36 dirtyepic Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1970,7 +1970,7 @@
config+="/t-linux64"
local sed_args=()
- if tc_version_is_at_least 4.8 ; then
+ if tc_version_is_at_least 4.7 ; then
sed_args+=( -e 's:$[(]call if_multiarch[^)]*[)]::g' )
fi
if [[ ${SYMLINK_LIB} == "yes" ]] ; then
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2013-04-17 2:31 Ryan Hill (dirtyepic)
0 siblings, 0 replies; 266+ messages in thread
From: Ryan Hill (dirtyepic) @ 2013-04-17 2:31 UTC (permalink / raw
To: gentoo-commits
dirtyepic 13/04/17 02:31:58
Modified: toolchain.eclass
Log:
Since this is conditional code 4.6.4 will have to be handled here after all.
Revision Changes Path
1.583 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.583&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.583&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.582&r2=1.583
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.582
retrieving revision 1.583
diff -u -r1.582 -r1.583
--- toolchain.eclass 17 Apr 2013 02:12:36 -0000 1.582
+++ toolchain.eclass 17 Apr 2013 02:31:58 -0000 1.583
@@ -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.eclass,v 1.582 2013/04/17 02:12:36 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.583 2013/04/17 02:31:58 dirtyepic Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1970,12 +1970,12 @@
config+="/t-linux64"
local sed_args=()
- if tc_version_is_at_least 4.7 ; then
+ if tc_version_is_at_least 4.6 ; then
sed_args+=( -e 's:$[(]call if_multiarch[^)]*[)]::g' )
fi
if [[ ${SYMLINK_LIB} == "yes" ]] ; then
einfo "updating multilib directories to be: ${libdirs}"
- if tc_version_is_at_least 4.7 ; then
+ if tc_version_is_at_least 4.6.4 || tc_version_is_at_least 4.7 ; then
sed_args+=( -e '/^MULTILIB_OSDIRNAMES.*lib32/s:[$][(]if.*):../lib32:' )
else
sed_args+=( -e "/^MULTILIB_OSDIRNAMES/s:=.*:= ${libdirs}:" )
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2013-04-20 4:12 Ryan Hill (dirtyepic)
0 siblings, 0 replies; 266+ messages in thread
From: Ryan Hill (dirtyepic) @ 2013-04-20 4:12 UTC (permalink / raw
To: gentoo-commits
dirtyepic 13/04/20 04:12:00
Modified: toolchain.eclass
Log:
Extend workaround for bug #411333 to Via C3-2 processors (bug #466454 by Andrew Church).
Revision Changes Path
1.584 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.584&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.584&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.583&r2=1.584
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.583
retrieving revision 1.584
diff -u -r1.583 -r1.584
--- toolchain.eclass 17 Apr 2013 02:31:58 -0000 1.583
+++ toolchain.eclass 20 Apr 2013 04:12:00 -0000 1.584
@@ -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.eclass,v 1.583 2013/04/17 02:31:58 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.584 2013/04/20 04:12:00 dirtyepic Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1413,7 +1413,8 @@
case ${GCC_BRANCH_VER} in
4.6)
# https://bugs.gentoo.org/411333
- replace-cpu-flags pentium2 pentium3 pentium3m pentium-m i686
+ # https://bugs.gentoo.org/466454
+ replace-cpu-flags c3-2 pentium2 pentium3 pentium3m pentium-m i686
;;
esac
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2013-05-03 6:01 Ryan Hill (dirtyepic)
0 siblings, 0 replies; 266+ messages in thread
From: Ryan Hill (dirtyepic) @ 2013-05-03 6:01 UTC (permalink / raw
To: gentoo-commits
dirtyepic 13/05/03 06:01:28
Modified: toolchain.eclass
Log:
Snapshots/vcs don't contain .info files.
Revision Changes Path
1.585 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.585&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.585&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.584&r2=1.585
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.584
retrieving revision 1.585
diff -u -r1.584 -r1.585
--- toolchain.eclass 20 Apr 2013 04:12:00 -0000 1.584
+++ toolchain.eclass 3 May 2013 06:01:27 -0000 1.585
@@ -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.eclass,v 1.584 2013/04/20 04:12:00 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.585 2013/05/03 06:01:27 dirtyepic Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1496,7 +1496,11 @@
# 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
- cp "${S}"/gcc/doc/*.info* gcc/doc/ || die
+ for x in "${S}"/gcc/doc/*.info* ; do
+ if [[ -f ${x} ]] ; then
+ cp "${x}" gcc/doc/ || die
+ fi
+ done
# Remove generated headers, as they can cause things to break
# (ncurses, openssl, etc).
while read x ; do
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2013-05-14 18:46 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2013-05-14 18:46 UTC (permalink / raw
To: gentoo-commits
vapier 13/05/14 18:46:36
Modified: toolchain.eclass
Log:
disable libatomic when building a stage1 gcc compiler
Revision Changes Path
1.587 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.587&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.587&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.586&r2=1.587
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.586
retrieving revision 1.587
diff -u -r1.586 -r1.587
--- toolchain.eclass 9 May 2013 03:03:02 -0000 1.586
+++ toolchain.eclass 14 May 2013 18:46:36 -0000 1.587
@@ -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.eclass,v 1.586 2013/05/09 03:03:02 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.587 2013/05/14 18:46:36 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1159,10 +1159,12 @@
avr) confgcc+=" --enable-shared --disable-threads";;
esac
if [[ -n ${needed_libc} ]] ; then
+ local confgcc_no_libc="--disable-shared"
+ tc_version_is_at_least 4.8 && confgcc_no_libc+=" --disable-libatomic"
if ! has_version ${CATEGORY}/${needed_libc} ; then
- confgcc+=" --disable-shared --disable-threads --without-headers"
+ confgcc+=" ${confgcc_no_libc} --disable-threads --without-headers"
elif built_with_use --hidden --missing false ${CATEGORY}/${needed_libc} crosscompile_opts_headers-only ; then
- confgcc+=" --disable-shared --with-sysroot=${PREFIX}/${CTARGET}"
+ confgcc+=" ${confgcc_no_libc} --with-sysroot=${PREFIX}/${CTARGET}"
else
confgcc+=" --with-sysroot=${PREFIX}/${CTARGET}"
fi
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2013-05-21 20:44 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2013-05-21 20:44 UTC (permalink / raw
To: gentoo-commits
vapier 13/05/21 20:44:00
Modified: toolchain.eclass
Log:
convert confgcc to an array to avoid overloading $@ and to clean things up a bit -- hopefully no real functional changes here
Revision Changes Path
1.591 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.591&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.591&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.590&r2=1.591
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.590
retrieving revision 1.591
diff -u -r1.590 -r1.591
--- toolchain.eclass 15 May 2013 05:42:09 -0000 1.590
+++ toolchain.eclass 21 May 2013 20:44:00 -0000 1.591
@@ -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.eclass,v 1.590 2013/05/15 05:42:09 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.591 2013/05/21 20:44:00 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -836,13 +836,13 @@
gcc-multilib-configure() {
if ! is_multilib ; then
- confgcc+=" --disable-multilib"
+ confgcc+=( --disable-multilib )
# Fun times: if we are building for a target that has multiple
# possible ABI formats, and the user has told us to pick one
# that isn't the default, then not specifying it via the list
# below will break that on us.
else
- confgcc+=" --enable-multilib"
+ confgcc+=( --enable-multilib )
fi
# translate our notion of multilibs into gcc's
@@ -854,7 +854,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.7 && confgcc+=( --with-multilib-list=${list:1} )
;;
esac
fi
@@ -865,21 +865,21 @@
if tc_version_is_at_least "4.0" ; then
if in_iuse mudflap ; then
- confgcc+=" $(use_enable mudflap libmudflap)"
+ confgcc+=( $(use_enable mudflap libmudflap) )
else
- confgcc+=" --disable-libmudflap"
+ confgcc+=( --disable-libmudflap )
fi
if use_if_iuse libssp ; then
- confgcc+=" --enable-libssp"
+ confgcc+=( --enable-libssp )
else
export gcc_cv_libc_provides_ssp=yes
- confgcc+=" --disable-libssp"
+ confgcc+=( --disable-libssp )
fi
# If we want hardened support with the newer piepatchset for >=gcc 4.4
if tc_version_is_at_least 4.4 && want_minispecs ; then
- confgcc+=" $(use_enable hardened esp)"
+ confgcc+=( $(use_enable hardened esp) )
fi
if tc_version_is_at_least "4.2" ; then
@@ -891,14 +891,14 @@
if ! is_crosscompile || \
$(tc-getCPP ${CTARGET}) -E - <<<"#include <pthread.h>" >& /dev/null
then
- confgcc+=" $(use_enable openmp libgomp)"
+ confgcc+=( $(use_enable openmp libgomp) )
else
# Force disable as the configure script can be dumb #359855
- confgcc+=" --disable-libgomp"
+ confgcc+=( --disable-libgomp )
fi
else
# For gcc variants where we don't want openmp (e.g. kgcc)
- confgcc+=" --disable-libgomp"
+ confgcc+=( --disable-libgomp )
fi
fi
@@ -913,48 +913,48 @@
#
# This should translate into "/share/gcc-data/${CTARGET}/${GCC_CONFIG_VER}/python"
if tc_version_is_at_least "4.4" ; then
- confgcc+=" --with-python-dir=${DATAPATH/$PREFIX/}/python"
+ confgcc+=( --with-python-dir=${DATAPATH/$PREFIX/}/python )
fi
fi
# Enable build warnings by default with cross-compilers when system
# paths are included (e.g. via -I flags).
- is_crosscompile && confgcc+=" --enable-poison-system-directories"
+ is_crosscompile && confgcc+=( --enable-poison-system-directories )
# For newer versions of gcc, use the default ("release"), because no
# one (even upstream apparently) tests with it disabled. #317217
if tc_version_is_at_least 4 || [[ -n ${GCC_CHECKS_LIST} ]] ; then
- confgcc+=" --enable-checking=${GCC_CHECKS_LIST:-release}"
+ confgcc+=( --enable-checking=${GCC_CHECKS_LIST:-release} )
else
- confgcc+=" --disable-checking"
+ confgcc+=( --disable-checking )
fi
# GTK+ is preferred over xlib in 3.4.x (xlib is unmaintained
# right now). Much thanks to <csm@gnu.org> for the heads up.
# Travis Tilley <lv@gentoo.org> (11 Jul 2004)
if ! is_gcj ; then
- confgcc+=" --disable-libgcj"
+ confgcc+=( --disable-libgcj )
elif use gtk ; then
- confgcc+=" --enable-java-awt=gtk"
+ confgcc+=( --enable-java-awt=gtk )
fi
# allow gcc to search for clock funcs in the main C lib.
# if it can't find them, then tough cookies -- we aren't
# going to link in -lrt to all C++ apps. #411681
if tc_version_is_at_least 4.4 && is_cxx ; then
- confgcc+=" --enable-libstdcxx-time"
+ confgcc+=( --enable-libstdcxx-time )
fi
# newer gcc versions like to bootstrap themselves with C++,
# so we need to manually disable it ourselves
if tc_version_is_at_least 4.7 && ! is_cxx ; then
- confgcc+=" --disable-build-with-cxx --disable-build-poststage1-with-cxx"
+ confgcc+=( --disable-build-with-cxx --disable-build-poststage1-with-cxx )
fi
# newer gcc's come with libquadmath, but only fortran uses
# it, so auto punt it when we don't care
if tc_version_is_at_least 4.6 && ! is_fortran ; then
- confgcc+=" --disable-libquadmath"
+ confgcc+=( --disable-libquadmath )
fi
local with_abi_map=()
@@ -974,7 +974,7 @@
if (srcdir=${S}/gcc target=${CTARGET} with_arch=${arm_arch};
. "${srcdir}"/config.gcc) &>/dev/null
then
- confgcc+=" --with-arch=${arm_arch}"
+ confgcc+=( --with-arch=${arm_arch} )
fi
# Enable hardvfp
@@ -983,37 +983,37 @@
tc_version_is_at_least "4.5"
then
# Follow the new arm hardfp distro standard by default
- confgcc+=" --with-float=hard"
+ confgcc+=( --with-float=hard )
case ${CTARGET} in
- armv6*) confgcc+=" --with-fpu=vfp" ;;
- armv7*) confgcc+=" --with-fpu=vfpv3-d16" ;;
+ armv6*) confgcc+=( --with-fpu=vfp ) ;;
+ armv7*) confgcc+=( --with-fpu=vfpv3-d16 ) ;;
esac
fi
;;
# Add --with-abi flags to set default ABI
mips)
- confgcc+=" --with-abi=$(gcc-abi-map ${TARGET_DEFAULT_ABI})"
+ confgcc+=( --with-abi=$(gcc-abi-map ${TARGET_DEFAULT_ABI}) )
;;
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
- confgcc+=" --with-abi=$(gcc-abi-map ${TARGET_DEFAULT_ABI})"
+ confgcc+=( --with-abi=$(gcc-abi-map ${TARGET_DEFAULT_ABI}) )
fi
;;
# Default arch for x86 is normally i386, lets give it a bump
# since glibc will do so based on CTARGET anyways
x86)
- confgcc+=" --with-arch=${CTARGET%%-*}"
+ confgcc+=( --with-arch=${CTARGET%%-*} )
;;
# Enable sjlj exceptions for backward compatibility on hppa
hppa)
- [[ ${GCCMAJOR} == "3" ]] && confgcc+=" --enable-sjlj-exceptions"
+ [[ ${GCCMAJOR} == "3" ]] && confgcc+=( --enable-sjlj-exceptions )
;;
# Set up defaults based on current CFLAGS
ppc)
- is-flagq -mfloat-gprs=double && confgcc+=" --enable-e500-double"
- [[ ${CTARGET//_/-} == *-e500v2-* ]] && confgcc+=" --enable-e500-double"
+ is-flagq -mfloat-gprs=double && confgcc+=( --enable-e500-double )
+ [[ ${CTARGET//_/-} == *-e500v2-* ]] && confgcc+=( --enable-e500-double )
;;
esac
@@ -1025,7 +1025,7 @@
if is_objc || is_objcxx ; then
GCC_LANG+=",objc"
if tc_version_is_at_least "4.0" ; then
- use objc-gc && confgcc+=" --enable-objc-gc"
+ use objc-gc && confgcc+=( --enable-objc-gc )
fi
is_objcxx && GCC_LANG+=",obj-c++"
fi
@@ -1042,94 +1042,94 @@
# is_ada && GCC_LANG+=",ada"
einfo "configuring for GCC_LANG: ${GCC_LANG}"
- confgcc+=" --enable-languages=${GCC_LANG}"
+ confgcc+=( --enable-languages=${GCC_LANG} )
}
gcc_do_configure() {
- local confgcc
-
- # Set configuration based on path variables
- confgcc+=" \
- --prefix=${PREFIX} \
- --bindir=${BINPATH} \
- --includedir=${INCLUDEPATH} \
- --datadir=${DATAPATH} \
- --mandir=${DATAPATH}/man \
- --infodir=${DATAPATH}/info \
- --with-gxx-include-dir=${STDCXX_INCDIR}"
+ local confgcc=(
+ # Set configuration based on path variables
+ --prefix="${PREFIX}"
+ --bindir="${BINPATH}"
+ --includedir="${INCLUDEPATH}"
+ --datadir="${DATAPATH}"
+ --mandir="${DATAPATH}/man"
+ --infodir="${DATAPATH}/info"
+ --with-gxx-include-dir="${STDCXX_INCDIR}"
+ )
# On Darwin we need libdir to be set in order to get correct install names
# for things like libobjc-gnu, libgcj and libfortran. If we enable it on
# non-Darwin we screw up the behaviour this eclass relies on. We in
# particular need this over --libdir for bug #255315.
[[ ${CTARGET} == *-darwin* ]] && \
- confgcc+=" --enable-version-specific-runtime-libs"
+ confgcc+=( --enable-version-specific-runtime-libs )
# All our cross-compile logic goes here ! woo !
- confgcc+=" --host=${CHOST}"
+ confgcc+=( --host=${CHOST} )
if is_crosscompile || tc-is-cross-compiler ; then
# Straight from the GCC install doc:
# "GCC has code to correctly determine the correct value for target
# for nearly all native systems. Therefore, we highly recommend you
# not provide a configure target when configuring a native compiler."
- confgcc+=" --target=${CTARGET}"
+ confgcc+=( --target=${CTARGET} )
fi
- [[ -n ${CBUILD} ]] && confgcc+=" --build=${CBUILD}"
+ [[ -n ${CBUILD} ]] && confgcc+=( --build=${CBUILD} )
# ppc altivec support
- confgcc+=" $(use_enable altivec)"
+ confgcc+=( $(use_enable altivec) )
# gcc has fixed-point arithmetic support in 4.3 for mips targets that can
# significantly increase compile time by several hours. This will allow
# users to control this feature in the event they need the support.
- tc_version_is_at_least "4.3" && confgcc+=" $(use_enable fixed-point)"
+ tc_version_is_at_least "4.3" && confgcc+=( $(use_enable fixed-point) )
# 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)"
- use graphite && confgcc+=" --disable-isl-version-check"
+ confgcc+=( $(use_with graphite cloog) )
+ use graphite && confgcc+=( --disable-isl-version-check )
elif tc_version_is_at_least "4.6" ; 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"
+ 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 )
elif tc_version_is_at_least "4.4" ; then
- confgcc+=" --without-cloog"
- confgcc+=" --without-ppl"
+ confgcc+=( --without-cloog )
+ confgcc+=( --without-ppl )
fi
if tc_version_is_at_least "4.6" ; then
- confgcc+=" $(use_enable lto)"
+ confgcc+=( $(use_enable lto) )
elif tc_version_is_at_least "4.5" ; then
- confgcc+=" --disable-lto"
+ confgcc+=( --disable-lto )
fi
case $(tc-is-softfloat) in
- yes) confgcc+=" --with-float=soft" ;;
- softfp) confgcc+=" --with-float=softfp" ;;
+ yes) confgcc+=( --with-float=soft ) ;;
+ softfp) confgcc+=( --with-float=softfp ) ;;
*)
# If they've explicitly opt-ed in, do hardfloat,
# otherwise let the gcc default kick in.
[[ ${CTARGET//_/-} == *-hardfloat-* ]] \
- && confgcc+=" --with-float=hard"
+ && confgcc+=( --with-float=hard )
;;
esac
# Native Language Support
if use nls ; then
- confgcc+=" --enable-nls --without-included-gettext"
+ confgcc+=( --enable-nls --without-included-gettext )
else
- confgcc+=" --disable-nls"
+ confgcc+=( --disable-nls )
fi
# reasonably sane globals (hopefully)
- confgcc+=" \
- --with-system-zlib \
- --enable-obsolete \
- --disable-werror \
- --enable-secureplt"
+ confgcc+=(
+ --with-system-zlib
+ --enable-obsolete
+ --disable-werror
+ --enable-secureplt
+ )
gcc-compiler-configure || die
@@ -1149,7 +1149,7 @@
$(tc-getCPP ${CTARGET}) -E -dD - 2>/dev/null | \
grep -q __HAVE_SHARED__
then #291870
- confgcc+=" --disable-shared"
+ confgcc+=( --disable-shared )
fi
needed_libc=uclibc
;;
@@ -1157,73 +1157,89 @@
x86_64-*-mingw*|\
*-w64-mingw*) needed_libc=mingw64-runtime;;
mingw*|*-mingw*) needed_libc=mingw-runtime;;
- avr) confgcc+=" --enable-shared --disable-threads";;
+ avr) confgcc+=( --enable-shared --disable-threads );;
esac
if [[ -n ${needed_libc} ]] ; then
- local confgcc_no_libc="--disable-shared"
- tc_version_is_at_least 4.8 && confgcc_no_libc+=" --disable-libatomic"
+ local confgcc_no_libc=( --disable-shared )
+ tc_version_is_at_least 4.8 && confgcc_no_libc+=( --disable-libatomic )
if ! has_version ${CATEGORY}/${needed_libc} ; then
- confgcc+=" ${confgcc_no_libc} --disable-threads --without-headers"
+ confgcc+=(
+ "${confgcc_no_libc[@]}"
+ --disable-threads
+ --without-headers
+ )
elif built_with_use --hidden --missing false ${CATEGORY}/${needed_libc} crosscompile_opts_headers-only ; then
- confgcc+=" ${confgcc_no_libc} --with-sysroot=${PREFIX}/${CTARGET}"
+ confgcc+=(
+ "${confgcc_no_libc[@]}"
+ --with-sysroot=${PREFIX}/${CTARGET}
+ )
else
- confgcc+=" --with-sysroot=${PREFIX}/${CTARGET}"
+ confgcc+=( --with-sysroot=${PREFIX}/${CTARGET} )
fi
fi
- tc_version_is_at_least 4.2 && confgcc+=" --disable-bootstrap"
+ tc_version_is_at_least 4.2 && confgcc+=( --disable-bootstrap )
else
if tc-is-static-only ; then
- confgcc+=" --disable-shared"
+ confgcc+=( --disable-shared )
else
- confgcc+=" --enable-shared"
+ confgcc+=( --enable-shared )
fi
case ${CHOST} in
mingw*|*-mingw*|*-cygwin)
- confgcc+=" --enable-threads=win32" ;;
+ confgcc+=( --enable-threads=win32 ) ;;
*)
- confgcc+=" --enable-threads=posix" ;;
+ confgcc+=( --enable-threads=posix ) ;;
esac
fi
# __cxa_atexit is "essential for fully standards-compliant handling of
# destructors", but apparently requires glibc.
case ${CTARGET} in
*-uclibc*)
- confgcc+=" --disable-__cxa_atexit $(use_enable nptl tls)"
- [[ ${GCCMAJOR}.${GCCMINOR} == 3.3 ]] && confgcc+=" --enable-sjlj-exceptions"
+ confgcc+=(
+ --disable-__cxa_atexit
+ $(use_enable nptl tls)
+ )
+ [[ ${GCCMAJOR}.${GCCMINOR} == 3.3 ]] && confgcc+=( --enable-sjlj-exceptions )
if tc_version_is_at_least 3.4 && ! tc_version_is_at_least 4.3 ; then
- confgcc+=" --enable-clocale=uclibc"
+ confgcc+=( --enable-clocale=uclibc )
fi
;;
*-elf|*-eabi)
- confgcc+=" --with-newlib"
+ confgcc+=( --with-newlib )
;;
*-gnu*)
- confgcc+=" --enable-__cxa_atexit"
- confgcc+=" --enable-clocale=gnu"
+ confgcc+=(
+ --enable-__cxa_atexit
+ --enable-clocale=gnu
+ )
;;
*-freebsd*)
- confgcc+=" --enable-__cxa_atexit"
+ confgcc+=( --enable-__cxa_atexit )
;;
*-solaris*)
- confgcc+=" --enable-__cxa_atexit"
+ confgcc+=( --enable-__cxa_atexit )
;;
esac
- tc_version_is_at_least 3.4 || confgcc+=" --disable-libunwind-exceptions"
+ tc_version_is_at_least 3.4 || confgcc+=( --disable-libunwind-exceptions )
# if the target can do biarch (-m32/-m64), enable it. overhead should
# be small, and should simplify building of 64bit kernels in a 32bit
# userland by not needing sys-devel/kgcc64. #349405
case $(tc-arch) in
- ppc|ppc64) tc_version_is_at_least 3.4 && confgcc+=" --enable-targets=all" ;;
- sparc) tc_version_is_at_least 4.4 && confgcc+=" --enable-targets=all" ;;
- amd64|x86) tc_version_is_at_least 4.3 && confgcc+=" --enable-targets=all" ;;
+ ppc|ppc64) tc_version_is_at_least 3.4 && confgcc+=( --enable-targets=all ) ;;
+ sparc) tc_version_is_at_least 4.4 && confgcc+=( --enable-targets=all ) ;;
+ amd64|x86) tc_version_is_at_least 4.3 && confgcc+=( --enable-targets=all ) ;;
esac
- tc_version_is_at_least 4.3 && set -- "$@" \
- --with-bugurl=http://bugs.gentoo.org/ \
+ tc_version_is_at_least 4.3 && confgcc+=(
+ --with-bugurl=http://bugs.gentoo.org/
--with-pkgversion="${BRANDING_GCC_PKGVERSION}"
- set -- ${confgcc} "$@" ${EXTRA_ECONF}
+ )
+ confgcc+=(
+ "$@"
+ ${EXTRA_ECONF}
+ )
# Disable gcc info regeneration -- it ships with generated info pages
# already. Our custom version/urls/etc... trigger it. #464008
@@ -1243,7 +1259,7 @@
einfo "DATAPATH: ${DATAPATH}"
einfo "STDCXX_INCDIR: ${STDCXX_INCDIR}"
echo
- einfo "Configuring GCC with: ${@//--/\n\t--}"
+ einfo "Configuring GCC with: ${confgcc[@]//--/\n\t--}"
echo
# Build in a separate build tree
@@ -1252,8 +1268,8 @@
# and now to do the actual configuration
addwrite /dev/zero
- echo "${S}"/configure "$@"
- "${S}"/configure "$@" || die "failed to run configure"
+ echo "${S}"/configure "${confgcc[@]}"
+ "${S}"/configure "${confgcc[@]}" || die "failed to run configure"
# return to whatever directory we were in before
popd > /dev/null
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2013-05-21 20:47 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2013-05-21 20:47 UTC (permalink / raw
To: gentoo-commits
vapier 13/05/21 20:47:44
Modified: toolchain.eclass
Log:
adjust case indentation so it is consistent in the whole file
Revision Changes Path
1.592 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.592&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.592&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.591&r2=1.592
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.591
retrieving revision 1.592
diff -u -r1.591 -r1.592
--- toolchain.eclass 21 May 2013 20:44:00 -0000 1.591
+++ toolchain.eclass 21 May 2013 20:47:44 -0000 1.592
@@ -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.eclass,v 1.591 2013/05/21 20:44:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.592 2013/05/21 20:47:44 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -959,62 +959,62 @@
local with_abi_map=()
case $(tc-arch) in
- arm) #264534 #414395
- local a arm_arch=${CTARGET%%-*}
- # Remove trailing endian variations first: eb el be bl b l
- for a in e{b,l} {b,l}e b l ; do
- if [[ ${arm_arch} == *${a} ]] ; then
- arm_arch=${arm_arch%${a}}
- break
- fi
- done
- # Convert armv7{a,r,m} to armv7-{a,r,m}
- [[ ${arm_arch} == armv7? ]] && arm_arch=${arm_arch/7/7-}
- # See if this is a valid --with-arch flag
- if (srcdir=${S}/gcc target=${CTARGET} with_arch=${arm_arch};
- . "${srcdir}"/config.gcc) &>/dev/null
- then
- confgcc+=( --with-arch=${arm_arch} )
- fi
-
- # Enable hardvfp
- if [[ $(tc-is-softfloat) == "no" ]] && \
- [[ ${CTARGET} == armv[67]* ]] && \
- tc_version_is_at_least "4.5"
- then
- # Follow the new arm hardfp distro standard by default
- confgcc+=( --with-float=hard )
- case ${CTARGET} in
- armv6*) confgcc+=( --with-fpu=vfp ) ;;
- armv7*) confgcc+=( --with-fpu=vfpv3-d16 ) ;;
- esac
+ arm) #264534 #414395
+ local a arm_arch=${CTARGET%%-*}
+ # Remove trailing endian variations first: eb el be bl b l
+ for a in e{b,l} {b,l}e b l ; do
+ if [[ ${arm_arch} == *${a} ]] ; then
+ arm_arch=${arm_arch%${a}}
+ break
fi
- ;;
+ done
+ # Convert armv7{a,r,m} to armv7-{a,r,m}
+ [[ ${arm_arch} == armv7? ]] && arm_arch=${arm_arch/7/7-}
+ # See if this is a valid --with-arch flag
+ if (srcdir=${S}/gcc target=${CTARGET} with_arch=${arm_arch};
+ . "${srcdir}"/config.gcc) &>/dev/null
+ then
+ confgcc+=( --with-arch=${arm_arch} )
+ fi
+
+ # Enable hardvfp
+ if [[ $(tc-is-softfloat) == "no" ]] && \
+ [[ ${CTARGET} == armv[67]* ]] && \
+ tc_version_is_at_least "4.5"
+ then
+ # Follow the new arm hardfp distro standard by default
+ confgcc+=( --with-float=hard )
+ case ${CTARGET} in
+ armv6*) confgcc+=( --with-fpu=vfp ) ;;
+ armv7*) confgcc+=( --with-fpu=vfpv3-d16 ) ;;
+ esac
+ fi
+ ;;
+ mips)
# Add --with-abi flags to set default ABI
- mips)
+ confgcc+=( --with-abi=$(gcc-abi-map ${TARGET_DEFAULT_ABI}) )
+ ;;
+ 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
confgcc+=( --with-abi=$(gcc-abi-map ${TARGET_DEFAULT_ABI}) )
- ;;
- 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
- confgcc+=( --with-abi=$(gcc-abi-map ${TARGET_DEFAULT_ABI}) )
- fi
- ;;
+ fi
+ ;;
+ x86)
# Default arch for x86 is normally i386, lets give it a bump
# since glibc will do so based on CTARGET anyways
- x86)
- confgcc+=( --with-arch=${CTARGET%%-*} )
- ;;
+ confgcc+=( --with-arch=${CTARGET%%-*} )
+ ;;
+ hppa)
# Enable sjlj exceptions for backward compatibility on hppa
- hppa)
- [[ ${GCCMAJOR} == "3" ]] && confgcc+=( --enable-sjlj-exceptions )
- ;;
+ [[ ${GCCMAJOR} == "3" ]] && confgcc+=( --enable-sjlj-exceptions )
+ ;;
+ ppc)
# Set up defaults based on current CFLAGS
- ppc)
- is-flagq -mfloat-gprs=double && confgcc+=( --enable-e500-double )
- [[ ${CTARGET//_/-} == *-e500v2-* ]] && confgcc+=( --enable-e500-double )
- ;;
+ is-flagq -mfloat-gprs=double && confgcc+=( --enable-e500-double )
+ [[ ${CTARGET//_/-} == *-e500v2-* ]] && confgcc+=( --enable-e500-double )
+ ;;
esac
local GCC_LANG="c"
@@ -1138,26 +1138,26 @@
# disable a bunch of features or gcc goes boom
local needed_libc=""
case ${CTARGET} in
- *-linux) needed_libc=no-fucking-clue;;
- *-dietlibc) needed_libc=dietlibc;;
- *-elf|*-eabi) needed_libc=newlib;;
- *-freebsd*) needed_libc=freebsd-lib;;
- *-gnu*) needed_libc=glibc;;
- *-klibc) needed_libc=klibc;;
- *-uclibc*)
- if ! echo '#include <features.h>' | \
- $(tc-getCPP ${CTARGET}) -E -dD - 2>/dev/null | \
- grep -q __HAVE_SHARED__
- then #291870
- confgcc+=( --disable-shared )
- fi
- needed_libc=uclibc
- ;;
- *-cygwin) needed_libc=cygwin;;
- x86_64-*-mingw*|\
- *-w64-mingw*) needed_libc=mingw64-runtime;;
- mingw*|*-mingw*) needed_libc=mingw-runtime;;
- avr) confgcc+=( --enable-shared --disable-threads );;
+ *-linux) needed_libc=no-fucking-clue;;
+ *-dietlibc) needed_libc=dietlibc;;
+ *-elf|*-eabi) needed_libc=newlib;;
+ *-freebsd*) needed_libc=freebsd-lib;;
+ *-gnu*) needed_libc=glibc;;
+ *-klibc) needed_libc=klibc;;
+ *-uclibc*)
+ if ! echo '#include <features.h>' | \
+ $(tc-getCPP ${CTARGET}) -E -dD - 2>/dev/null | \
+ grep -q __HAVE_SHARED__
+ then #291870
+ confgcc+=( --disable-shared )
+ fi
+ needed_libc=uclibc
+ ;;
+ *-cygwin) needed_libc=cygwin;;
+ x86_64-*-mingw*|\
+ *-w64-mingw*) needed_libc=mingw64-runtime;;
+ mingw*|*-mingw*) needed_libc=mingw-runtime;;
+ avr) confgcc+=( --enable-shared --disable-threads );;
esac
if [[ -n ${needed_libc} ]] ; then
local confgcc_no_libc=( --disable-shared )
@@ -1186,10 +1186,10 @@
confgcc+=( --enable-shared )
fi
case ${CHOST} in
- mingw*|*-mingw*|*-cygwin)
- confgcc+=( --enable-threads=win32 ) ;;
- *)
- confgcc+=( --enable-threads=posix ) ;;
+ mingw*|*-mingw*|*-cygwin)
+ confgcc+=( --enable-threads=win32 ) ;;
+ *)
+ confgcc+=( --enable-threads=posix ) ;;
esac
fi
# __cxa_atexit is "essential for fully standards-compliant handling of
@@ -1431,7 +1431,7 @@
replace-cpu-flags c3-2 pentium2 pentium3 pentium3m pentium-m i686
;;
esac
-
+
# CFLAGS logic (verified with 3.4.3):
# CFLAGS:
# This conflicts when creating a crosscompiler, so set to a sane
@@ -1982,11 +1982,11 @@
# this only makes sense for some Linux targets
case ${CTARGET} in
- x86_64*-linux*) config="i386" ;;
- powerpc64*-linux*) config="rs6000" ;;
- sparc64*-linux*) config="sparc" ;;
- s390x*-linux*) config="s390" ;;
- *) return 0 ;;
+ x86_64*-linux*) config="i386" ;;
+ powerpc64*-linux*) config="rs6000" ;;
+ sparc64*-linux*) config="sparc" ;;
+ s390x*-linux*) config="s390" ;;
+ *) return 0 ;;
esac
config+="/t-linux64"
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2013-05-24 21:07 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2013-05-24 21:07 UTC (permalink / raw
To: gentoo-commits
vapier 13/05/24 21:07:21
Modified: toolchain.eclass
Log:
enable thumb mode by default for arm targets that are using the microcontroller profile #418209 by Jiri Pittner & Boris Vingradov
Revision Changes Path
1.593 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.593&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.593&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.592&r2=1.593
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.592
retrieving revision 1.593
diff -u -r1.592 -r1.593
--- toolchain.eclass 21 May 2013 20:47:44 -0000 1.592
+++ toolchain.eclass 24 May 2013 21:07:21 -0000 1.593
@@ -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.eclass,v 1.592 2013/05/21 20:47:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.593 2013/05/24 21:07:21 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -977,6 +977,9 @@
confgcc+=( --with-arch=${arm_arch} )
fi
+ # Make default mode thumb for microcontroller classes #418209
+ [[ ${arm_arch} == *-m ]] && confgcc+=( --with-mode=thumb )
+
# Enable hardvfp
if [[ $(tc-is-softfloat) == "no" ]] && \
[[ ${CTARGET} == armv[67]* ]] && \
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2013-06-17 2:23 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2013-06-17 2:23 UTC (permalink / raw
To: gentoo-commits
vapier 13/06/17 02:23:45
Modified: toolchain.eclass
Log:
handle musl C library #473328 by Anthony Basile
Revision Changes Path
1.594 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.594&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.594&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.593&r2=1.594
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.593
retrieving revision 1.594
diff -u -r1.593 -r1.594
--- toolchain.eclass 24 May 2013 21:07:21 -0000 1.593
+++ toolchain.eclass 17 Jun 2013 02:23:45 -0000 1.594
@@ -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.eclass,v 1.593 2013/05/24 21:07:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.594 2013/06/17 02:23:45 vapier Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1147,6 +1147,7 @@
*-freebsd*) needed_libc=freebsd-lib;;
*-gnu*) needed_libc=glibc;;
*-klibc) needed_libc=klibc;;
+ *-musl*) needed_libc=musl;;
*-uclibc*)
if ! echo '#include <features.h>' | \
$(tc-getCPP ${CTARGET}) -E -dD - 2>/dev/null | \
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2013-07-18 22:33 Ryan Hill (dirtyepic)
0 siblings, 0 replies; 266+ messages in thread
From: Ryan Hill (dirtyepic) @ 2013-07-18 22:33 UTC (permalink / raw
To: gentoo-commits
dirtyepic 13/07/18 22:33:48
Modified: toolchain.eclass
Log:
Minor cleanups, no functional changes.
Revision Changes Path
1.595 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.595&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.595&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.594&r2=1.595
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.594
retrieving revision 1.595
diff -u -r1.594 -r1.595
--- toolchain.eclass 17 Jun 2013 02:23:45 -0000 1.594
+++ toolchain.eclass 18 Jul 2013 22:33:48 -0000 1.595
@@ -1,12 +1,12 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.594 2013/06/17 02:23:45 vapier Exp $
-#
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.595 2013/07/18 22:33:48 dirtyepic Exp $
+
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
#---->> eclass stuff <<----
+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 versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib fixheadtails pax-utils
@@ -23,12 +23,10 @@
inherit git-2
fi
-EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_test src_install pkg_postinst pkg_postrm
-DESCRIPTION="The GNU Compiler Collection"
-
FEATURES=${FEATURES/multilib-strict/}
-#----<< eclass stuff >>----
+EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_test src_install pkg_postinst pkg_postrm
+#----<< eclass stuff >>----
#---->> globals <<----
export CTARGET=${CTARGET:-${CHOST}}
@@ -45,7 +43,11 @@
[[ ${CHOST} != ${CTARGET} ]]
}
-tc_version_is_at_least() { version_is_at_least "$1" "${2:-${GCC_RELEASE_VER}}" ; }
+# General purpose version check. Without a second arg matches up to minor version (x.x.x)
+# (ie. 4.6.0_pre9999 matches 4 or 4.6 or 4.6.0 but not 4.6.1)
+tc_version_is_at_least() {
+ version_is_at_least "$1" "${2:-${GCC_RELEASE_VER}}"
+}
GCC_PV=${TOOLCHAIN_GCC_PV:-${PV}}
GCC_PVR=${GCC_PV}
@@ -55,7 +57,8 @@
GCCMAJOR=$(get_version_component_range 1 ${GCC_PV})
GCCMINOR=$(get_version_component_range 2 ${GCC_PV})
GCCMICRO=$(get_version_component_range 3 ${GCC_PV})
-[[ ${BRANCH_UPDATE-notset} == "notset" ]] && BRANCH_UPDATE=$(get_version_component_range 4 ${GCC_PV})
+[[ ${BRANCH_UPDATE-notset} == "notset" ]] && \
+ BRANCH_UPDATE=$(get_version_component_range 4 ${GCC_PV})
# According to gcc/c-cppbuiltin.c, GCC_CONFIG_VER MUST match this regex.
# ([^0-9]*-)?[0-9]+[.][0-9]+([.][0-9]+)?([- ].*)?
@@ -65,6 +68,7 @@
if [[ ${GCC_PV} != ${GCC_PV/_pre/-} ]] ; then
PRERELEASE=${GCC_PV/_pre/-}
fi
+
# make _alpha and _beta ebuilds automatically use a snapshot
if [[ ${GCC_PV} == *_alpha* ]] ; then
SNAPSHOT=${GCC_BRANCH_VER}-${GCC_PV##*_alpha}
@@ -73,8 +77,8 @@
elif [[ ${GCC_PV} == *_rc* ]] ; then
SNAPSHOT=${GCC_PV%_rc*}-RC-${GCC_PV##*_rc}
fi
-export GCC_FILESDIR=${GCC_FILESDIR:-${FILESDIR}}
+export GCC_FILESDIR=${GCC_FILESDIR:-${FILESDIR}}
PREFIX=${TOOLCHAIN_PREFIX:-/usr}
if tc_version_is_at_least 3.4.0 ; then
@@ -83,19 +87,20 @@
LIBPATH=${TOOLCHAIN_LIBPATH:-${PREFIX}/lib/gcc-lib/${CTARGET}/${GCC_CONFIG_VER}}
fi
INCLUDEPATH=${TOOLCHAIN_INCLUDEPATH:-${LIBPATH}/include}
+
if is_crosscompile ; then
BINPATH=${TOOLCHAIN_BINPATH:-${PREFIX}/${CHOST}/${CTARGET}/gcc-bin/${GCC_CONFIG_VER}}
else
BINPATH=${TOOLCHAIN_BINPATH:-${PREFIX}/${CTARGET}/gcc-bin/${GCC_CONFIG_VER}}
fi
+
DATAPATH=${TOOLCHAIN_DATAPATH:-${PREFIX}/share/gcc-data/${CTARGET}/${GCC_CONFIG_VER}}
+
# Dont install in /usr/include/g++-v3/, but in gcc internal directory.
# We will handle /usr/include/g++-v3/ with gcc-config ...
STDCXX_INCDIR=${TOOLCHAIN_STDCXX_INCDIR:-${LIBPATH}/include/g++-v${GCC_BRANCH_VER/\.*/}}
-
#----<< globals >>----
-
#---->> SLOT+IUSE logic <<----
IUSE="multislot nls nptl regression-test vanilla"
@@ -105,18 +110,14 @@
[[ -n ${HTB_VER} ]] && IUSE+=" boundschecking"
[[ -n ${D_VER} ]] && IUSE+=" d"
[[ -n ${SPECS_VER} ]] && IUSE+=" nossp"
-
- if tc_version_is_at_least 3 ; then
- IUSE+=" doc gcj gtk hardened multilib objc"
-
- tc_version_is_at_least "4.0" && IUSE+=" objc-gc mudflap"
- tc_version_is_at_least "4.1" && IUSE+=" libssp objc++"
- tc_version_is_at_least "4.2" && IUSE+=" 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.6" && IUSE+=" lto"
- tc_version_is_at_least "4.7" && IUSE+=" go"
- fi
+ tc_version_is_at_least 3 && IUSE+=" doc gcj gtk hardened multilib objc"
+ tc_version_is_at_least 4.0 && IUSE+=" objc-gc mudflap"
+ tc_version_is_at_least 4.1 && IUSE+=" libssp objc++"
+ tc_version_is_at_least 4.2 && IUSE+=" 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.6 && IUSE+=" lto"
+ tc_version_is_at_least 4.7 && IUSE+=" go"
fi
# Support upgrade paths here or people get pissed
@@ -128,12 +129,11 @@
#----<< SLOT+IUSE logic >>----
#---->> DEPEND <<----
-
RDEPEND="sys-libs/zlib
nls? ( sys-devel/gettext )"
-if tc_version_is_at_least 3 ; then
- RDEPEND+=" virtual/libiconv"
-fi
+
+tc_version_is_at_least 3 && RDEPEND+=" virtual/libiconv"
+
if tc_version_is_at_least 4 ; then
GMP_MPFR_DEPS=">=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2"
if tc_version_is_at_least 4.3 ; then
@@ -141,10 +141,10 @@
elif in_iuse fortran ; then
RDEPEND+=" fortran? ( ${GMP_MPFR_DEPS} )"
fi
- if tc_version_is_at_least 4.5 ; then
- RDEPEND+=" >=dev-libs/mpc-0.8.1"
- fi
fi
+
+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+="
@@ -168,7 +168,9 @@
>=dev-util/dejagnu-1.4.4
>=sys-devel/autogen-5.5.4
)"
+
if in_iuse gcj ; then
+ GCJ_DEPS=">=media-libs/libart_lgpl-2.1"
GCJ_GTK_DEPS="
x11-libs/libXt
x11-libs/libX11
@@ -183,13 +185,11 @@
) )
"
tc_version_is_at_least 3.4 && GCJ_GTK_DEPS+=" x11-libs/pango"
- GCJ_DEPS=">=media-libs/libart_lgpl-2.1"
tc_version_is_at_least 4.2 && GCJ_DEPS+=" app-arch/zip app-arch/unzip"
DEPEND+=" gcj? ( gtk? ( ${GCJ_GTK_DEPS} ) ${GCJ_DEPS} )"
fi
PDEPEND=">=sys-devel/gcc-config-1.7"
-
#----<< DEPEND >>----
#---->> S + SRC_URI essentials <<----
@@ -292,8 +292,10 @@
GCC_SRC_URI+=" $(gentoo_urls gcc-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2)"
fi
- [[ -n ${UCLIBC_VER} ]] && GCC_SRC_URI+=" $(gentoo_urls gcc-${UCLIBC_GCC_VER}-uclibc-patches-${UCLIBC_VER}.tar.bz2)"
- [[ -n ${PATCH_VER} ]] && GCC_SRC_URI+=" $(gentoo_urls gcc-${PATCH_GCC_VER}-patches-${PATCH_VER}.tar.bz2)"
+ [[ -n ${UCLIBC_VER} ]] && \
+ GCC_SRC_URI+=" $(gentoo_urls gcc-${UCLIBC_GCC_VER}-uclibc-patches-${UCLIBC_VER}.tar.bz2)"
+ [[ -n ${PATCH_VER} ]] && \
+ GCC_SRC_URI+=" $(gentoo_urls gcc-${PATCH_GCC_VER}-patches-${PATCH_VER}.tar.bz2)"
# strawberry pie, Cappuccino and a Gauloises (it's a good thing)
[[ -n ${PIE_VER} ]] && \
@@ -301,7 +303,8 @@
GCC_SRC_URI+=" $(gentoo_urls ${PIE_CORE})"
# gcc minispec for the hardened gcc 4 compiler
- [[ -n ${SPECS_VER} ]] && GCC_SRC_URI+=" $(gentoo_urls gcc-${SPECS_GCC_VER}-specs-${SPECS_VER}.tar.bz2)"
+ [[ -n ${SPECS_VER} ]] && \
+ GCC_SRC_URI+=" $(gentoo_urls gcc-${SPECS_GCC_VER}-specs-${SPECS_VER}.tar.bz2)"
# gcc bounds checking patch
if [[ -n ${HTB_VER} ]] ; then
@@ -313,14 +316,13 @@
)"
fi
- [[ -n ${D_VER} ]] && GCC_SRC_URI+=" d? ( mirror://sourceforge/dgcc/gdc-${D_VER}-src.tar.bz2 )"
+ [[ -n ${D_VER} ]] && \
+ GCC_SRC_URI+=" d? ( mirror://sourceforge/dgcc/gdc-${D_VER}-src.tar.bz2 )"
- # >= gcc-4.3 uses ecj.jar and we only add gcj as a use flag under certain
- # conditions
- if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then
- if tc_version_is_at_least "4.5" ; then
+ if in_iuse gcj ; then
+ if tc_version_is_at_least 4.5 ; then
GCC_SRC_URI+=" gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )"
- elif tc_version_is_at_least "4.3" ; then
+ elif tc_version_is_at_least 4.3 ; then
GCC_SRC_URI+=" gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )"
fi
fi
@@ -330,7 +332,6 @@
SRC_URI=$(get_gcc_src_uri)
#---->> S + SRC_URI essentials >>----
-
#---->> support checks <<----
# Grab a variable from the build system (taken from linux-info.eclass)
@@ -404,7 +405,7 @@
want_minispecs() {
if tc_version_is_at_least 4.3.2 && use hardened ; then
if ! want_pie ; then
- ewarn "PIE_VER or SPECS_VER is not defiend in the GCC ebuild."
+ ewarn "PIE_VER or SPECS_VER is not defined in the GCC ebuild."
elif use vanilla ; then
ewarn "You will not get hardened features if you have the vanilla USE-flag."
elif use nopie && use nossp ; then
@@ -430,7 +431,6 @@
[[ -z ${TOOLCHAIN_ALLOWED_LANGS} ]] && return 0
has $1 ${TOOLCHAIN_ALLOWED_LANGS}
}
-
#----<< support checks >>----
#---->> specs + env.d logic <<----
@@ -517,6 +517,7 @@
MULTIOSDIRS="${mosdirs}"
EOF
}
+
setup_minispecs_gcc_build_specs() {
# Setup the "build.specs" file for gcc 4.3 to use when building.
if hardened_gcc_works pie ; then
@@ -532,6 +533,7 @@
done
export GCC_SPECS="${WORKDIR}"/build.specs
}
+
copy_minispecs_gcc_specs() {
# setup the hardenedno* specs files and the vanilla specs file.
if hardened_gcc_works ; then
@@ -548,7 +550,6 @@
doins "${WORKDIR}"/specs/*.specs || die "failed to install specs"
# Build system specs file which, if it exists, must be a complete set of
# specs as it completely and unconditionally overrides the builtin specs.
- # For gcc 4.3
if ! tc_version_is_at_least 4.4 ; then
$(XGCC) -dumpspecs > "${WORKDIR}"/specs/specs
cat "${WORKDIR}"/build.specs >> "${WORKDIR}"/specs/specs
@@ -561,10 +562,9 @@
#---->> pkg_* <<----
toolchain_pkg_setup() {
if [[ -n ${PRERELEASE}${SNAPSHOT} || ${PV} == *9999* ]] &&
- [[ -z ${I_PROMISE_TO_SUPPLY_PATCHES_WITH_BUGS} ]]
- then
- die "Please \`export I_PROMISE_TO_SUPPLY_PATCHES_WITH_BUGS=1\` or define it in your make.conf if you want to use this version." \
- "This is to try and cut down on people filing bugs for a compiler we do not currently support."
+ [[ -z ${I_PROMISE_TO_SUPPLY_PATCHES_WITH_BUGS} ]] ; then
+ die "Please \`export I_PROMISE_TO_SUPPLY_PATCHES_WITH_BUGS=1\` or define it" \
+ "in your make.conf if you want to use this version."
fi
# we dont want to use the installed compiler's specs to build gcc!
@@ -593,10 +593,6 @@
ewarn "major versions (like 4.2 to 4.3):"
ewarn "http://www.gentoo.org/doc/en/gcc-upgrading.xml"
echo
- fi
-
- if ! is_crosscompile ; then
- # hack to prevent collisions between SLOTs
# Clean up old paths
rm -f "${ROOT}"/*/rcscripts/awk/fixlafiles.awk "${ROOT}"/sbin/fix_libtool_files.sh
@@ -660,6 +656,7 @@
&& EPATCH_SUFFIX="patch.bz2" \
|| EPATCH_SUFFIX="patch"
}
+
do_gcc_rename_java_bins() {
# bug #139918 - conflict between gcc and java-config-2 for ownership of
# /usr/bin/rmi{c,registry}. Done with mv & sed rather than a patch
@@ -669,12 +666,12 @@
# Kevin F. Quinn 2006-07-12
einfo "Renaming jdk executables rmic and rmiregistry to grmic and grmiregistry."
# 1) Move the man files if present (missing prior to gcc-3.4)
- for manfile in rmic rmiregistry; do
+ for manfile in rmic rmiregistry ; do
[[ -f ${S}/gcc/doc/${manfile}.1 ]] || continue
mv "${S}"/gcc/doc/${manfile}.1 "${S}"/gcc/doc/g${manfile}.1
done
# 2) Fixup references in the docs if present (mission prior to gcc-3.4)
- for jfile in gcc/doc/gcj.info gcc/doc/grmic.1 gcc/doc/grmiregistry.1 gcc/java/gcj.texi; do
+ for jfile in gcc/doc/gcj.info gcc/doc/grmic.1 gcc/doc/grmiregistry.1 gcc/java/gcj.texi ; do
[[ -f ${S}/${jfile} ]] || continue
sed -i -e 's:rmiregistry:grmiregistry:g' "${S}"/${jfile} ||
die "Failed to fixup file ${jfile} for rename to grmiregistry"
@@ -684,7 +681,7 @@
# 3) Fixup Makefiles to build the changed executable names
# These are present in all 3.x versions, and are the important bit
# to get gcc to build with the new names.
- for jfile in libjava/Makefile.am libjava/Makefile.in gcc/java/Make-lang.in; do
+ for jfile in libjava/Makefile.am libjava/Makefile.in gcc/java/Make-lang.in ; do
sed -i -e 's:rmiregistry:grmiregistry:g' "${S}"/${jfile} ||
die "Failed to fixup file ${jfile} for rename to grmiregistry"
# Careful with rmic on these files; it's also the name of a directory
@@ -694,8 +691,10 @@
die "Failed to fixup file ${jfile} for rename to grmic"
done
}
+
toolchain_src_unpack() {
- [[ -z ${UCLIBC_VER} ]] && [[ ${CTARGET} == *-uclibc* ]] && die "Sorry, this version does not support uClibc"
+ [[ -z ${UCLIBC_VER} ]] && [[ ${CTARGET} == *-uclibc* ]] && \
+ die "Sorry, this version does not support uClibc"
if [[ ${PV} == *9999* ]]; then
git-2_src_unpack
@@ -749,8 +748,8 @@
fi
setup_multilib_osdirnames
-
gcc_version_patch
+
if tc_version_is_at_least 4.1 ; then
if [[ -n ${SNAPSHOT} || -n ${PRERELEASE} ]] ; then
# BASE-VER must be a three-digit version number
@@ -764,10 +763,10 @@
# >= gcc-4.3 doesn't bundle ecj.jar, so copy it
if tc_version_is_at_least 4.3 && use gcj ; then
- if tc_version_is_at_least "4.5" ; then
+ if tc_version_is_at_least 4.5 ; then
einfo "Copying ecj-4.5.jar"
cp -pPR "${DISTDIR}/ecj-4.5.jar" "${S}/ecj.jar" || die
- elif tc_version_is_at_least "4.3" ; then
+ else
einfo "Copying ecj-4.3.jar"
cp -pPR "${DISTDIR}/ecj-4.3.jar" "${S}/ecj.jar" || die
fi
@@ -793,7 +792,6 @@
fi
# Fixup libtool to correctly generate .la files with portage
- cd "${S}"
elibtoolize --portage --shallow --no-uclibc
gnuconfig_update
@@ -801,6 +799,7 @@
# update configure files
local f
einfo "Fixing misc issues in configure files"
+ # TODO - check if we can drop this now that we don't gen info files
tc_version_is_at_least 4.1 && epatch "${GCC_FILESDIR}"/gcc-configure-texinfo.patch
for f in $(grep -l 'autoconf version 2.13' $(find "${S}" -name configure)) ; do
ebegin " Updating ${f/${S}\/} [LANG]"
@@ -863,7 +862,7 @@
gcc-compiler-configure() {
gcc-multilib-configure
- if tc_version_is_at_least "4.0" ; then
+ if tc_version_is_at_least 4.0 ; then
if in_iuse mudflap ; then
confgcc+=( $(use_enable mudflap libmudflap) )
else
@@ -882,7 +881,7 @@
confgcc+=( $(use_enable hardened esp) )
fi
- if tc_version_is_at_least "4.2" ; then
+ if tc_version_is_at_least 4.2 ; then
if in_iuse openmp ; then
# Make sure target has pthreads support. #326757 #335883
# There shouldn't be a chicken&egg problem here as openmp won't
@@ -912,7 +911,7 @@
# then --with-python-dir=/lib/python2.5/site-packages should be passed.
#
# This should translate into "/share/gcc-data/${CTARGET}/${GCC_CONFIG_VER}/python"
- if tc_version_is_at_least "4.4" ; then
+ if tc_version_is_at_least 4.4 ; then
confgcc+=( --with-python-dir=${DATAPATH/$PREFIX/}/python )
fi
fi
@@ -983,7 +982,7 @@
# Enable hardvfp
if [[ $(tc-is-softfloat) == "no" ]] && \
[[ ${CTARGET} == armv[67]* ]] && \
- tc_version_is_at_least "4.5"
+ tc_version_is_at_least 4.5
then
# Follow the new arm hardfp distro standard by default
confgcc+=( --with-float=hard )
@@ -1027,7 +1026,7 @@
is_go && GCC_LANG+=",go"
if is_objc || is_objcxx ; then
GCC_LANG+=",objc"
- if tc_version_is_at_least "4.0" ; then
+ if tc_version_is_at_least 4 ; then
use objc-gc && confgcc+=( --enable-objc-gc )
fi
is_objcxx && GCC_LANG+=",obj-c++"
@@ -1083,28 +1082,28 @@
# gcc has fixed-point arithmetic support in 4.3 for mips targets that can
# significantly increase compile time by several hours. This will allow
# users to control this feature in the event they need the support.
- tc_version_is_at_least "4.3" && confgcc+=( $(use_enable fixed-point) )
+ tc_version_is_at_least 4.3 && confgcc+=( $(use_enable fixed-point) )
# 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
+ if tc_version_is_at_least 4.8 ; then
confgcc+=( $(use_with graphite cloog) )
use graphite && confgcc+=( --disable-isl-version-check )
- elif tc_version_is_at_least "4.6" ; then
+ elif tc_version_is_at_least 4.6 ; 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 )
- elif tc_version_is_at_least "4.4" ; then
+ elif tc_version_is_at_least 4.4 ; then
confgcc+=( --without-cloog )
confgcc+=( --without-ppl )
fi
- if tc_version_is_at_least "4.6" ; then
+ if tc_version_is_at_least 4.6 ; then
confgcc+=( $(use_enable lto) )
- elif tc_version_is_at_least "4.5" ; then
+ elif tc_version_is_at_least 4.5 ; then
confgcc+=( --disable-lto )
fi
@@ -1225,6 +1224,7 @@
confgcc+=( --enable-__cxa_atexit )
;;
esac
+
tc_version_is_at_least 3.4 || confgcc+=( --disable-libunwind-exceptions )
# if the target can do biarch (-m32/-m64), enable it. overhead should
@@ -1240,6 +1240,7 @@
--with-bugurl=http://bugs.gentoo.org/
--with-pkgversion="${BRANDING_GCC_PKGVERSION}"
)
+
confgcc+=(
"$@"
${EXTRA_ECONF}
@@ -1376,7 +1377,6 @@
popd >/dev/null
}
-# This is mostly a stub function to be overwritten in an ebuild
gcc_do_filter_flags() {
strip-flags
@@ -1436,6 +1436,8 @@
;;
esac
+ # TODO: Move to gcc_do_make()
+
# CFLAGS logic (verified with 3.4.3):
# CFLAGS:
# This conflicts when creating a crosscompiler, so set to a sane
@@ -1508,28 +1510,31 @@
}
toolchain_src_install() {
- local x=
-
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
+ local x=
for x in "${S}"/gcc/doc/*.info* ; do
if [[ -f ${x} ]] ; then
cp "${x}" gcc/doc/ || die
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
+ S="${WORKDIR}"/build emake -j1 DESTDIR="${D}" install || die
+
# Punt some tools which are really only useful while building gcc
find "${D}" -name install-tools -prune -type d -exec rm -rf "{}" \;
# This one comes with binutils
@@ -1549,15 +1554,12 @@
create_gcc_env_entry
# Setup the gcc_env_entry for hardened gcc 4 with minispecs
- if want_minispecs ; then
- copy_minispecs_gcc_specs
- fi
+ want_minispecs && copy_minispecs_gcc_specs
+
# Make sure we dont have stuff lying around that
# can nuke multiple versions of gcc
-
gcc_slot_java
- # These should be symlinks
dodir /usr/bin
cd "${D}"${BINPATH}
# Ugh: we really need to auto-detect this list.
@@ -1573,8 +1575,7 @@
dosym ${BINPATH}/${CTARGET}-${x} \
/usr/bin/${x}-${GCC_CONFIG_VER}
fi
-
- # Create version-ed symlinks
+ # Create versioned symlinks
dosym ${BINPATH}/${CTARGET}-${x} \
/usr/bin/${CTARGET}-${x}-${GCC_CONFIG_VER}
fi
@@ -1753,7 +1754,6 @@
done
find "${D}" -type d | xargs rmdir >& /dev/null
}
-
#----<< src_* >>----
#---->> unorganized crap in need of refactoring follows
@@ -1838,7 +1838,7 @@
use vanilla && return 0
- if tc_version_is_at_least 4.3.2; then
+ if tc_version_is_at_least 4.3.2 ; then
guess_patch_type_in_dir "${WORKDIR}"/piepatch/
EPATCH_MULTI_MSG="Applying pie patches ..." \
epatch "${WORKDIR}"/piepatch/
@@ -1862,7 +1862,7 @@
-e 's|^ALL_CFLAGS = |ALL_CFLAGS = $(HARD_CFLAGS) |' \
-i "${S}"/gcc/Makefile.in
# Need to add HARD_CFLAGS to ALL_CXXFLAGS on >= 4.7
- if tc_version_is_at_least 4.7.0 ; then
+ if tc_version_is_at_least 4.7 ; then
sed -e '/^ALL_CXXFLAGS/iHARD_CFLAGS = ' \
-e 's|^ALL_CXXFLAGS = |ALL_CXXFLAGS = $(HARD_CFLAGS) |' \
-i "${S}"/gcc/Makefile.in
@@ -1935,15 +1935,13 @@
ewarn "due to enabling/disabling hardened or switching to a version"
ewarn "of gcc that doesnt create multiple specs files. The default"
ewarn "config will be used, and the previous preference forgotten."
- ebeep
- epause
use_specs=""
fi
gcc-config ${CTARGET}-${GCC_CONFIG_VER}${use_specs}
}
-# This function allows us to gentoo-ize gcc's version number and bugzilla
+# This function allows us to gentoo-ize GCCs version number and bugzilla
# URL without needing to use patches.
gcc_version_patch() {
# gcc-4.3+ has configure flags (whoo!)
@@ -2097,9 +2095,3 @@
#use treelang
return 0
}
-
-# should kill these off once all the ebuilds are migrated
-gcc_pkg_setup() { toolchain_pkg_setup ; }
-gcc_src_unpack() { toolchain_src_unpack ; }
-gcc_src_compile() { toolchain_src_compile ; }
-gcc_src_test() { toolchain_src_test ; }
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2013-12-27 22:54 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2013-12-27 22:54 UTC (permalink / raw
To: gentoo-commits
vapier 13/12/27 22:54:43
Modified: toolchain.eclass
Log:
stub out the treelang info page in older gcc builds #496224 by Adam Randall
Revision Changes Path
1.611 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.611&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.611&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.610&r2=1.611
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.610
retrieving revision 1.611
diff -u -r1.610 -r1.611
--- toolchain.eclass 27 Dec 2013 22:10:29 -0000 1.610
+++ toolchain.eclass 27 Dec 2013 22:54:43 -0000 1.611
@@ -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.eclass,v 1.610 2013/12/27 22:10:29 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.611 2013/12/27 22:54:43 vapier Exp $
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1150,6 +1150,8 @@
# 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
+ # Make sure we don't try to generate pages that don't even exist. #496224
+ touch "${S}"/gcc/treelang/treelang.info 2>/dev/null
# Do not let the X detection get in our way. We know things can be found
# via system paths, so no need to hardcode things that'll break multilib.
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2013-12-31 0:32 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2013-12-31 0:32 UTC (permalink / raw
To: gentoo-commits
vapier 13/12/31 00:32:43
Modified: toolchain.eclass
Log:
eat trailing whitespace -- no functional changes
Revision Changes Path
1.617 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.617&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.617&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.616&r2=1.617
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.616
retrieving revision 1.617
diff -u -r1.616 -r1.617
--- toolchain.eclass 30 Dec 2013 03:24:04 -0000 1.616
+++ toolchain.eclass 31 Dec 2013 00:32:43 -0000 1.617
@@ -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.eclass,v 1.616 2013/12/30 03:24:04 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.617 2013/12/31 00:32:43 vapier Exp $
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -51,7 +51,7 @@
}
# General purpose version check. Without a second arg matches up to minor version (x.x.x)
-tc_version_is_at_least() {
+tc_version_is_at_least() {
version_is_at_least "$1" "${2:-${GCC_RELEASE_VER}}"
}
@@ -1209,7 +1209,7 @@
replace-cpu-flags G3 750
replace-cpu-flags G4 7400
replace-cpu-flags G5 7400
-
+
case $(tc-arch) in
amd64)
replace-cpu-flags core2 nocona
@@ -2079,7 +2079,7 @@
has toolchain_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS+=" toolchain_death_notice"
toolchain_death_notice() {
- if [[ -e "${WORKDIR}"/build ]] ; then
+ if [[ -e "${WORKDIR}"/build ]] ; then
pushd "${WORKDIR}"/build >/dev/null
(echo '' | $(tc-getCC ${CTARGET}) ${CFLAGS} -v -E - 2>&1) > gccinfo.log
[[ -e "${T}"/build.log ]] && cp "${T}"/build.log .
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2013-12-31 0:33 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2013-12-31 0:33 UTC (permalink / raw
To: gentoo-commits
vapier 13/12/31 00:33:44
Modified: toolchain.eclass
Log:
fix cross-compiling a stage1 with gcc-4.8 -- we can't enable c++ right away
Revision Changes Path
1.618 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.618&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.618&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.617&r2=1.618
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.617
retrieving revision 1.618
diff -u -r1.617 -r1.618
--- toolchain.eclass 31 Dec 2013 00:32:43 -0000 1.617
+++ toolchain.eclass 31 Dec 2013 00:33:43 -0000 1.618
@@ -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.eclass,v 1.617 2013/12/31 00:32:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.618 2013/12/31 00:33:43 vapier Exp $
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1932,7 +1932,7 @@
is_cxx() {
gcc-lang-supported 'c++' || return 1
- tc_version_is_at_least 4.8 && return 0
+ ! is_crosscompile && tc_version_is_at_least 4.8 && return 0
use cxx
}
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2014-05-18 20:28 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2014-05-18 20:28 UTC (permalink / raw
To: gentoo-commits
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 Changes Path
1.626 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.626&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.626&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.625&r2=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.eclass 15 May 2014 05:18:33 -0000 1.625
+++ toolchain.eclass 18 May 2014 20:28:27 -0000 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 <toolchain@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}
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2014-06-01 17:29 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2014-06-01 17:29 UTC (permalink / raw
To: gentoo-commits
vapier 14/06/01 17:29:42
Modified: toolchain.eclass
Log:
downgrade_arch_flags: simplify bash logic a bit
Revision Changes Path
1.631 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.631&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.631&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.630&r2=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.eclass 21 May 2014 21:30:26 -0000 1.630
+++ toolchain.eclass 1 Jun 2014 17:29:42 -0000 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 <toolchain@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 - 2>&1 \
- | grep cc1 | sed -e 's:.*-march=\([^ ]*\).*:\1:')
+ arch=$($(tc-getCC) -march=native -v -E -P - </dev/null 2>&1 \
+ | 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
+ 3.4 pentium4m pentium4
+ )
myarch=$(get-flag march)
mytune=$(get-flag mtune)
- for ((i=0; i < ${#archlist[@]}; i++)) ; do
- arch=${archlist[i]%% *}
- ver=${archlist[i]#* } ver=${ver% *}
- rep=${archlist[i]##* }
+ for ((i = 0; i < ${#archlist[@]}; i += 3)) ; do
+ ver=${archlist[i]}
+ arch=${archlist[i + 1]}
+ rep=${archlist[i + 2]}
[[ ${myarch} != ${arch} && ${mytune} != ${arch} ]] && continue
-
+
if [[ ${ver} > ${bver} ]] ; then
- einfo "Replacing ${myarch} (added in ${ver}) with ${rep}..."
+ einfo "Replacing ${myarch} (added in gcc ${ver}) with ${rep}..."
[[ ${myarch} == ${arch} ]] && replace-cpu-flags ${myarch} ${rep}
[[ ${mytune} == ${arch} ]] && replace-cpu-flags ${mytune} ${rep}
downgrade_arch_flags ${1:-${GCC_BRANCH_VER}}
@@ -1292,45 +1292,46 @@
fi
done
- declare -a isalist
- # we only check -mno* here since -m* get removed by strip-flags later on
- isalist=("-mno-sha 4.9")
- isalist+=("-mno-avx512pf 4.9")
- isalist+=("-mno-avx512f 4.9")
- isalist+=("-mno-avx512er 4.9")
- isalist+=("-mno-avx512cd 4.9")
- isalist+=("-mno-xsaveopt 4.8")
- isalist+=("-mno-xsave 4.8")
- isalist+=("-mno-rtm 4.8")
- isalist+=("-mno-fxsr 4.8")
- isalist+=("-mno-lzcnt 4.7")
- isalist+=("-mno-bmi2 4.7")
- isalist+=("-mno-avx2 4.7")
- isalist+=("-mno-tbm 4.6")
- isalist+=("-mno-rdrnd 4.6")
- isalist+=("-mno-fsgsbase 4.6")
- isalist+=("-mno-f16c 4.6")
- isalist+=("-mno-bmi 4.6")
- isalist+=("-mno-xop 4.5")
- isalist+=("-mno-movbe 4.5")
- isalist+=("-mno-lwp 4.5")
- isalist+=("-mno-fma4 4.5")
- isalist+=("-mno-pclmul 4.4")
- isalist+=("-mno-fma 4.4")
- isalist+=("-mno-avx 4.4")
- isalist+=("-mno-aes 4.4")
- isalist+=("-mno-ssse3 4.3")
- isalist+=("-mno-sse4a 4.3")
- isalist+=("-mno-sse4 4.3")
- isalist+=("-mno-sse4.2 4.3")
- isalist+=("-mno-sse4.1 4.3")
- isalist+=("-mno-popcnt 4.3")
- isalist+=("-mno-abm 4.3")
-
- for ((i=0; i < ${#isalist[@]}; i++)) ; do
- isa=${isalist[i]%% *}
- ver=${isalist[i]##* }
- [[ ${ver} > ${bver} ]] && filter-flags ${isa}
+ local isalist=(
+ # we only check -mno* here since -m* get removed by strip-flags later on
+ 4.9 -mno-sha
+ 4.9 -mno-avx512pf
+ 4.9 -mno-avx512f
+ 4.9 -mno-avx512er
+ 4.9 -mno-avx512cd
+ 4.8 -mno-xsaveopt
+ 4.8 -mno-xsave
+ 4.8 -mno-rtm
+ 4.8 -mno-fxsr
+ 4.7 -mno-lzcnt
+ 4.7 -mno-bmi2
+ 4.7 -mno-avx2
+ 4.6 -mno-tbm
+ 4.6 -mno-rdrnd
+ 4.6 -mno-fsgsbase
+ 4.6 -mno-f16c
+ 4.6 -mno-bmi
+ 4.5 -mno-xop
+ 4.5 -mno-movbe
+ 4.5 -mno-lwp
+ 4.5 -mno-fma4
+ 4.4 -mno-pclmul
+ 4.4 -mno-fma
+ 4.4 -mno-avx
+ 4.4 -mno-aes
+ 4.3 -mno-ssse3
+ 4.3 -mno-sse4a
+ 4.3 -mno-sse4
+ 4.3 -mno-sse4.2
+ 4.3 -mno-sse4.1
+ 4.3 -mno-popcnt
+ 4.3 -mno-abm
+ )
+
+ for ((i = 0; i < ${#isalist[@]}; i += 2)) ; do
+ ver=${isalist[i]}
+ isa=${isalist[i + 1]}
+ [[ ${ver} > ${bver} ]] && filter-flags ${isa} ${isa/-m/-mno-}
done
}
@@ -1361,9 +1362,9 @@
case $(tc-arch) in
amd64|x86)
filter-flags '-mcpu=*'
-
+
tc_version_is_between 4.4 4.5 && append-flags -mno-avx # 357287
-
+
if tc_version_is_between 4.6 4.7 ; then
# https://bugs.gentoo.org/411333
# https://bugs.gentoo.org/466454
@@ -1485,7 +1486,7 @@
# gcc_do_make all-target-libstdc++-v3
[[ -n ${1} ]] && GCC_MAKE_TARGET=${1}
-
+
# default target
if is_crosscompile || tc-is-cross-compiler ; then
# 3 stage bootstrapping doesnt quite work when you cant run the
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2014-08-05 1:04 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 266+ messages in thread
From: Robin H. Johnson (robbat2) @ 2014-08-05 1:04 UTC (permalink / raw
To: gentoo-commits
robbat2 14/08/05 01:04:21
Modified: toolchain.eclass
Log:
Fix typo.
Revision Changes Path
1.634 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.634&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.634&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.633&r2=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.eclass 4 Aug 2014 23:03:28 -0000 1.633
+++ toolchain.eclass 5 Aug 2014 01:04:21 -0000 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 <toolchain@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
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2014-10-17 2:48 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2014-10-17 2:48 UTC (permalink / raw
To: gentoo-commits
vapier 14/10/17 02:48:01
Modified: toolchain.eclass
Log:
enable --enable-linker-build-id by default with gcc-4.5+
Revision Changes Path
1.636 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.636&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.636&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.635&r2=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.eclass 5 Aug 2014 01:41:01 -0000 1.635
+++ toolchain.eclass 17 Oct 2014 02:48:01 -0000 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 <toolchain@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
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2014-10-17 4:02 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2014-10-17 4:02 UTC (permalink / raw
To: gentoo-commits
vapier 14/10/17 04:02:50
Modified: toolchain.eclass
Log:
handle the new gcc-5.x snapshots which changed their versioning slightly
Revision Changes Path
1.637 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.637&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.637&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.636&r2=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.eclass 17 Oct 2014 02:48:01 -0000 1.636
+++ toolchain.eclass 17 Oct 2014 04:02:50 -0000 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 <toolchain@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}
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2014-10-19 5:38 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2014-10-19 5:38 UTC (permalink / raw
To: gentoo-commits
vapier 14/10/19 05:38:32
Modified: toolchain.eclass
Log:
use arrays for IUSE_DEF to simplify code
Revision Changes Path
1.638 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.638&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.638&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.637&r2=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.eclass 17 Oct 2014 04:02:50 -0000 1.637
+++ toolchain.eclass 19 Oct 2014 05:38:32 -0000 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 <toolchain@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
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2014-10-19 5:42 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2014-10-19 5:42 UTC (permalink / raw
To: gentoo-commits
vapier 14/10/19 05:42:28
Modified: toolchain.eclass
Log:
add USE=sanitize to control libsanitizer #525174 by Lukas Lihotzki
Revision Changes Path
1.639 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.639&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.639&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.638&r2=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.eclass 19 Oct 2014 05:38:32 -0000 1.638
+++ toolchain.eclass 19 Oct 2014 05:42:28 -0000 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 <toolchain@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
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2014-10-20 17:16 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2014-10-20 17:16 UTC (permalink / raw
To: gentoo-commits
vapier 14/10/20 17:16:45
Modified: toolchain.eclass
Log:
restrict --enable-linker-build-id to known ELF targets #525942
Revision Changes Path
1.640 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.640&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.640&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.639&r2=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.eclass 19 Oct 2014 05:42:28 -0000 1.639
+++ toolchain.eclass 20 Oct 2014 17:16:45 -0000 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 <toolchain@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
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2014-10-24 0:21 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2014-10-24 0:21 UTC (permalink / raw
To: gentoo-commits
vapier 14/10/24 00:21:54
Modified: toolchain.eclass
Log:
expand LICENSE handling for all versions
Revision Changes Path
1.641 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.641&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.641&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.640&r2=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.eclass 20 Oct 2014 17:16:45 -0000 1.640
+++ toolchain.eclass 24 Oct 2014 00:21:54 -0000 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 <toolchain@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 )
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2014-10-24 0:29 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2014-10-24 0:29 UTC (permalink / raw
To: gentoo-commits
vapier 14/10/24 00:29:34
Modified: toolchain.eclass
Log:
centralize the gcc snapshot/prerelease warning message
Revision Changes Path
1.642 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.642&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.642&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.641&r2=1.642
Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.641
retrieving revision 1.642
diff -u -r1.641 -r1.642
--- toolchain.eclass 24 Oct 2014 00:21:54 -0000 1.641
+++ toolchain.eclass 24 Oct 2014 00:29:34 -0000 1.642
@@ -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.641 2014/10/24 00:21:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.642 2014/10/24 00:29:34 vapier Exp $
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1969,6 +1969,12 @@
elog "Testsuite results have been installed into /usr/share/doc/${PF}/testsuite"
echo
fi
+
+ if [[ -n ${PRERELEASE}${SNAPSHOT} ]] ; then
+ einfo "This GCC ebuild is provided for your convenience, and the use"
+ einfo "of this compiler is not supported by the Gentoo Developers."
+ einfo "Please report bugs to upstream at http://gcc.gnu.org/bugzilla/"
+ fi
}
toolchain_pkg_postrm() {
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2014-10-24 5:32 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2014-10-24 5:32 UTC (permalink / raw
To: gentoo-commits
vapier 14/10/24 05:32:14
Modified: toolchain.eclass
Log:
rework gcc-5.x snapshots again
Revision Changes Path
1.643 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.643&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.643&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.642&r2=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.eclass 24 Oct 2014 00:29:34 -0000 1.642
+++ toolchain.eclass 24 Oct 2014 05:32:14 -0000 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 <toolchain@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} == *9999* ]] ; 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} != *9999* ]] ; 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} ]] && \
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2014-11-02 21:30 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2014-11-02 21:30 UTC (permalink / raw
To: gentoo-commits
vapier 14/11/02 21:30:11
Modified: toolchain.eclass
Log:
enable multislot for all versions <4.7
Revision Changes Path
1.645 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.645&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.645&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.644&r2=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.eclass 26 Oct 2014 17:39:52 -0000 1.644
+++ toolchain.eclass 2 Nov 2014 21:30:11 -0000 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 <toolchain@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}"
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2014-11-15 8:45 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2014-11-15 8:45 UTC (permalink / raw
To: gentoo-commits
vapier 14/11/15 08:45:33
Modified: toolchain.eclass
Log:
enbale --with-float=hard for arm eabihf tuples #528278
Revision Changes Path
1.647 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.647&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.647&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.646&r2=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.eclass 4 Nov 2014 08:04:00 -0000 1.646
+++ toolchain.eclass 15 Nov 2014 08:45:33 -0000 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 <toolchain@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=()
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2015-01-21 21:59 Anthony G. Basile (blueness)
0 siblings, 0 replies; 266+ messages in thread
From: Anthony G. Basile (blueness) @ 2015-01-21 21:59 UTC (permalink / raw
To: gentoo-commits
blueness 15/01/21 21:59:31
Modified: toolchain.eclass
Log:
Stub out fixed includes, bug #536878.
Revision Changes Path
1.648 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.648&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.648&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.647&r2=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.eclass 15 Nov 2014 08:45:33 -0000 1.647
+++ toolchain.eclass 21 Jan 2015 21:59:31 -0000 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 <toolchain@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
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2015-02-09 20:05 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2015-02-09 20:05 UTC (permalink / raw
To: gentoo-commits
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 Changes Path
1.650 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.650&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.650&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.649&r2=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.eclass 5 Feb 2015 23:28:17 -0000 1.649
+++ toolchain.eclass 9 Feb 2015 20:05:07 -0000 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 <toolchain@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}"
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2015-02-15 6:54 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2015-02-15 6:54 UTC (permalink / raw
To: gentoo-commits
vapier 15/02/15 06:54:31
Modified: toolchain.eclass
Log:
reland multislot logic now that the three packages impacted have been updated
Revision Changes Path
1.654 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.654&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.654&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.653&r2=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.eclass 10 Feb 2015 07:22:00 -0000 1.653
+++ toolchain.eclass 15 Feb 2015 06:54:31 -0000 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 <toolchain@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}"
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2015-03-13 19:59 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2015-03-13 19:59 UTC (permalink / raw
To: gentoo-commits
vapier 15/03/13 19:59:45
Modified: toolchain.eclass
Log:
enable multislot for 4.6.x now that has cycled out
Revision Changes Path
1.655 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.655&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.655&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.654&r2=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.eclass 15 Feb 2015 06:54:31 -0000 1.654
+++ toolchain.eclass 13 Mar 2015 19:59:45 -0000 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 <toolchain@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}"
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2015-03-17 5:24 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2015-03-17 5:24 UTC (permalink / raw
To: gentoo-commits
vapier 15/03/17 05:24:34
Modified: toolchain.eclass
Log:
disable USE=graphite support for versions older than gcc-4.8 #448024
Revision Changes Path
1.656 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.656&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.656&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.655&r2=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.eclass 13 Mar 2015 19:59:45 -0000 1.655
+++ toolchain.eclass 17 Mar 2015 05:24:34 -0000 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 <toolchain@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
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2015-03-17 6:34 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2015-03-17 6:34 UTC (permalink / raw
To: gentoo-commits
vapier 15/03/17 06:34:54
Modified: toolchain.eclass
Log:
drop x32 support for gcc-4.7 #543578
Revision Changes Path
1.657 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.657&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.657&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.656&r2=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.eclass 17 Mar 2015 05:24:34 -0000 1.656
+++ toolchain.eclass 17 Mar 2015 06:34:54 -0000 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 <toolchain@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
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2015-03-29 6:15 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2015-03-29 6:15 UTC (permalink / raw
To: gentoo-commits
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 Changes Path
1.658 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.658&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.658&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.657&r2=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.eclass 17 Mar 2015 06:34:54 -0000 1.657
+++ toolchain.eclass 29 Mar 2015 06:15:31 -0000 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 <toolchain@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}
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2015-03-29 18:30 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2015-03-29 18:30 UTC (permalink / raw
To: gentoo-commits
vapier 15/03/29 18:30:34
Modified: toolchain.eclass
Log:
put each alpha release into its own SLOT
Revision Changes Path
1.659 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.659&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.659&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.658&r2=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.eclass 29 Mar 2015 06:15:31 -0000 1.658
+++ toolchain.eclass 29 Mar 2015 18:30:34 -0000 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 <toolchain@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}"
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2015-03-29 19:17 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2015-03-29 19:17 UTC (permalink / raw
To: gentoo-commits
vapier 15/03/29 19:17:05
Modified: toolchain.eclass
Log:
Add USE=cilk to control support for the Cilk Plus language.
Revision Changes Path
1.660 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.660&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.660&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.659&r2=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.eclass 29 Mar 2015 18:30:34 -0000 1.659
+++ toolchain.eclass 29 Mar 2015 19:17:05 -0000 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 <toolchain@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
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2015-04-13 4:15 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2015-04-13 4:15 UTC (permalink / raw
To: gentoo-commits
vapier 15/04/13 04:15:59
Modified: toolchain.eclass
Log:
force the configure shell to bash to work around older configure detection
Revision Changes Path
1.661 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.661&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.661&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.660&r2=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.eclass 29 Mar 2015 19:17:05 -0000 1.660
+++ toolchain.eclass 13 Apr 2015 04:15:59 -0000 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 <toolchain@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
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2015-04-13 4:16 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2015-04-13 4:16 UTC (permalink / raw
To: gentoo-commits
vapier 15/04/13 04:16:35
Modified: toolchain.eclass
Log:
handle versions 6.x+ like 5.x
Revision Changes Path
1.662 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.662&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.662&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.661&r2=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.eclass 13 Apr 2015 04:15:59 -0000 1.661
+++ toolchain.eclass 13 Apr 2015 04:16:35 -0000 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 <toolchain@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}}
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2015-04-20 9:00 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2015-04-20 9:00 UTC (permalink / raw
To: gentoo-commits
vapier 15/04/20 09:00:20
Modified: toolchain.eclass
Log:
all sanitizer la files #546700 by Mihai Moldovan
Revision Changes Path
1.663 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.663&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.663&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.662&r2=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.eclass 13 Apr 2015 04:16:35 -0000 1.662
+++ toolchain.eclass 20 Apr 2015 09:00:20 -0000 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 <toolchain@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
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2015-04-20 9:04 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2015-04-20 9:04 UTC (permalink / raw
To: gentoo-commits
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 Changes Path
1.664 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.664&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.664&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.663&r2=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.eclass 20 Apr 2015 09:00:20 -0000 1.663
+++ toolchain.eclass 20 Apr 2015 09:04:09 -0000 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 <toolchain@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
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2015-04-23 19:17 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2015-04-23 19:17 UTC (permalink / raw
To: gentoo-commits
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 Changes Path
1.665 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.665&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.665&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.664&r2=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.eclass 20 Apr 2015 09:04:09 -0000 1.664
+++ toolchain.eclass 23 Apr 2015 19:17:19 -0000 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 <toolchain@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? (
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2015-05-04 5:43 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2015-05-04 5:43 UTC (permalink / raw
To: gentoo-commits
vapier 15/05/04 05:43:08
Modified: toolchain.eclass
Log:
call die in more places to catch bad sed/mv commands
Revision Changes Path
1.666 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.666&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.666&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.665&r2=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.eclass 23 Apr 2015 19:17:19 -0000 1.665
+++ toolchain.eclass 4 May 2015 05:43:08 -0000 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 <toolchain@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
}
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2015-05-08 11:21 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2015-05-08 11:21 UTC (permalink / raw
To: gentoo-commits
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 Changes Path
1.667 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.667&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.667&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.666&r2=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.eclass 4 May 2015 05:43:08 -0000 1.666
+++ toolchain.eclass 8 May 2015 11:21:02 -0000 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 <toolchain@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') \
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2015-05-11 3:05 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2015-05-11 3:05 UTC (permalink / raw
To: gentoo-commits
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 Changes Path
1.668 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.668&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.668&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.667&r2=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.eclass 8 May 2015 11:21:02 -0000 1.667
+++ toolchain.eclass 11 May 2015 03:05:21 -0000 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 <toolchain@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
}
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2015-05-13 9:12 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2015-05-13 9:12 UTC (permalink / raw
To: gentoo-commits
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 Changes Path
1.669 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.669&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.669&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.668&r2=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.eclass 11 May 2015 03:05:21 -0000 1.668
+++ toolchain.eclass 13 May 2015 09:12:57 -0000 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 <toolchain@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
}
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2015-05-26 8:32 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2015-05-26 8:32 UTC (permalink / raw
To: gentoo-commits
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 Changes Path
1.671 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.671&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.671&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.670&r2=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.eclass 25 May 2015 08:41:16 -0000 1.670
+++ toolchain.eclass 26 May 2015 08:32:39 -0000 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 <toolchain@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
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2015-05-27 10:29 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2015-05-27 10:29 UTC (permalink / raw
To: gentoo-commits
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 Changes Path
1.672 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.672&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.672&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.671&r2=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.eclass 26 May 2015 08:32:39 -0000 1.671
+++ toolchain.eclass 27 May 2015 10:29:03 -0000 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 <toolchain@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
}
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2015-06-01 7:04 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2015-06-01 7:04 UTC (permalink / raw
To: gentoo-commits
vapier 15/06/01 07:04:04
Modified: toolchain.eclass
Log:
drop EAPI=0 & EAPI=1 support
Revision Changes Path
1.673 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.673&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.673&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.672&r2=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.eclass 27 May 2015 10:29:03 -0000 1.672
+++ toolchain.eclass 1 Jun 2015 07:04:04 -0000 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 <toolchain@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 ...
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2015-06-01 7:17 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2015-06-01 7:17 UTC (permalink / raw
To: gentoo-commits
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 Changes Path
1.674 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.674&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.674&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.673&r2=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.eclass 1 Jun 2015 07:04:04 -0000 1.673
+++ toolchain.eclass 1 Jun 2015 07:17:40 -0000 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 <toolchain@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
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2015-06-01 16:05 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2015-06-01 16:05 UTC (permalink / raw
To: gentoo-commits
vapier 15/06/01 16:05:44
Modified: toolchain.eclass
Log:
add USE=pie for gcc-6 to control enabling pie by default
Revision Changes Path
1.675 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.675&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.675&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.674&r2=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.eclass 1 Jun 2015 07:17:40 -0000 1.674
+++ toolchain.eclass 1 Jun 2015 16:05:43 -0000 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 <toolchain@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
^ permalink raw reply [flat|nested] 266+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
@ 2015-07-17 7:36 Mike Frysinger (vapier)
0 siblings, 0 replies; 266+ messages in thread
From: Mike Frysinger (vapier) @ 2015-07-17 7:36 UTC (permalink / raw
To: gentoo-commits
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 Changes Path
1.676 eclass/toolchain.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.676&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.676&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.675&r2=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.eclass 1 Jun 2015 16:05:43 -0000 1.675
+++ toolchain.eclass 17 Jul 2015 07:36:00 -0000 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 <toolchain@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
^ permalink raw reply [flat|nested] 266+ messages in thread
end of thread, other threads:[~2015-07-17 7:36 UTC | newest]
Thread overview: 266+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-01 16:05 [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass Mike Frysinger (vapier)
-- strict thread matches above, loose matches on Subject: below --
2015-07-17 7:36 Mike Frysinger (vapier)
2015-06-01 7:17 Mike Frysinger (vapier)
2015-06-01 7:04 Mike Frysinger (vapier)
2015-05-27 10:29 Mike Frysinger (vapier)
2015-05-26 8:32 Mike Frysinger (vapier)
2015-05-13 9:12 Mike Frysinger (vapier)
2015-05-11 3:05 Mike Frysinger (vapier)
2015-05-08 11:21 Mike Frysinger (vapier)
2015-05-04 5:43 Mike Frysinger (vapier)
2015-04-23 19:17 Mike Frysinger (vapier)
2015-04-20 9:04 Mike Frysinger (vapier)
2015-04-20 9:00 Mike Frysinger (vapier)
2015-04-13 4:16 Mike Frysinger (vapier)
2015-04-13 4:15 Mike Frysinger (vapier)
2015-03-29 19:17 Mike Frysinger (vapier)
2015-03-29 18:30 Mike Frysinger (vapier)
2015-03-29 6:15 Mike Frysinger (vapier)
2015-03-17 6:34 Mike Frysinger (vapier)
2015-03-17 5:24 Mike Frysinger (vapier)
2015-03-13 19:59 Mike Frysinger (vapier)
2015-02-15 6:54 Mike Frysinger (vapier)
2015-02-09 20:05 Mike Frysinger (vapier)
2015-01-21 21:59 Anthony G. Basile (blueness)
2014-11-15 8:45 Mike Frysinger (vapier)
2014-11-02 21:30 Mike Frysinger (vapier)
2014-10-24 5:32 Mike Frysinger (vapier)
2014-10-24 0:29 Mike Frysinger (vapier)
2014-10-24 0:21 Mike Frysinger (vapier)
2014-10-20 17:16 Mike Frysinger (vapier)
2014-10-19 5:42 Mike Frysinger (vapier)
2014-10-19 5:38 Mike Frysinger (vapier)
2014-10-17 4:02 Mike Frysinger (vapier)
2014-10-17 2:48 Mike Frysinger (vapier)
2014-08-05 1:04 Robin H. Johnson (robbat2)
2014-06-01 17:29 Mike Frysinger (vapier)
2014-05-18 20:28 Mike Frysinger (vapier)
2013-12-31 0:33 Mike Frysinger (vapier)
2013-12-31 0:32 Mike Frysinger (vapier)
2013-12-27 22:54 Mike Frysinger (vapier)
2013-07-18 22:33 Ryan Hill (dirtyepic)
2013-06-17 2:23 Mike Frysinger (vapier)
2013-05-24 21:07 Mike Frysinger (vapier)
2013-05-21 20:47 Mike Frysinger (vapier)
2013-05-21 20:44 Mike Frysinger (vapier)
2013-05-14 18:46 Mike Frysinger (vapier)
2013-05-03 6:01 Ryan Hill (dirtyepic)
2013-04-20 4:12 Ryan Hill (dirtyepic)
2013-04-17 2:31 Ryan Hill (dirtyepic)
2013-04-17 2:12 Ryan Hill (dirtyepic)
2013-04-10 19:16 Mike Frysinger (vapier)
2013-04-08 6:19 Mike Frysinger (vapier)
2013-04-07 18:27 Mike Frysinger (vapier)
2013-04-07 8:56 Mike Frysinger (vapier)
2013-04-07 8:51 Mike Frysinger (vapier)
2013-04-06 3:47 Mike Frysinger (vapier)
2013-04-02 3:02 Ryan Hill (dirtyepic)
2013-04-01 8:00 Mike Frysinger (vapier)
2013-04-01 7:59 Mike Frysinger (vapier)
2013-02-09 4:34 Mike Frysinger (vapier)
2013-01-24 1:27 Mike Frysinger (vapier)
2012-12-29 6:45 Mike Frysinger (vapier)
2012-12-29 6:44 Mike Frysinger (vapier)
2012-12-29 6:41 Mike Frysinger (vapier)
2012-12-29 6:08 Mike Frysinger (vapier)
2012-12-24 4:56 Mike Frysinger (vapier)
2012-12-24 4:20 Mike Frysinger (vapier)
2012-11-29 1:16 Mike Frysinger (vapier)
2012-11-24 22:27 Mike Frysinger (vapier)
2012-11-24 21:20 Mike Frysinger (vapier)
2012-11-22 6:16 Mike Frysinger (vapier)
2012-11-22 5:19 Mike Frysinger (vapier)
2012-11-19 6:55 Mike Frysinger (vapier)
2012-11-19 2:59 Mike Frysinger (vapier)
2012-11-02 20:18 Mike Frysinger (vapier)
2012-10-01 5:03 Mike Frysinger (vapier)
2012-08-19 1:23 Mike Frysinger (vapier)
2012-06-11 21:07 Mike Frysinger (vapier)
2012-06-05 17:08 Mike Frysinger (vapier)
2012-06-03 9:02 Mike Frysinger (vapier)
2012-06-03 9:00 Mike Frysinger (vapier)
2012-06-02 20:40 Mike Frysinger (vapier)
2012-06-02 20:39 Mike Frysinger (vapier)
2012-06-02 20:18 Mike Frysinger (vapier)
2012-06-02 20:16 Mike Frysinger (vapier)
2012-05-30 15:47 Mike Frysinger (vapier)
2012-05-22 5:08 Mike Frysinger (vapier)
2012-05-18 4:59 Mike Frysinger (vapier)
2012-05-15 18:51 Mike Frysinger (vapier)
2012-05-13 20:24 Mike Frysinger (vapier)
2012-05-13 20:20 Mike Frysinger (vapier)
2012-05-10 5:03 Mike Frysinger (vapier)
2012-04-14 17:00 Mike Frysinger (vapier)
2012-03-15 20:18 Mike Frysinger (vapier)
2012-03-14 20:46 Mike Frysinger (vapier)
2012-03-04 18:46 Mike Frysinger (vapier)
2012-03-04 5:40 Mike Frysinger (vapier)
2012-03-03 22:42 Mike Frysinger (vapier)
2012-03-03 2:47 Ryan Hill (dirtyepic)
2012-03-02 5:56 Mike Frysinger (vapier)
2012-02-28 23:34 Mike Frysinger (vapier)
2011-12-16 18:44 Mike Frysinger (vapier)
2011-12-15 20:42 Mike Frysinger (vapier)
2011-12-15 5:58 Mike Frysinger (vapier)
2011-12-13 0:21 Mike Frysinger (vapier)
2011-12-10 8:55 Mike Frysinger (vapier)
2011-12-08 22:38 Mike Frysinger (vapier)
2011-12-08 18:11 Mike Frysinger (vapier)
2011-12-07 16:11 Mike Frysinger (vapier)
2011-12-06 22:12 Mike Frysinger (vapier)
2011-12-06 21:30 Mike Frysinger (vapier)
2011-12-06 20:11 Mike Frysinger (vapier)
2011-12-06 5:22 Mike Frysinger (vapier)
2011-12-06 5:10 Mike Frysinger (vapier)
2011-12-06 5:02 Mike Frysinger (vapier)
2011-12-06 4:59 Mike Frysinger (vapier)
2011-12-06 4:54 Mike Frysinger (vapier)
2011-12-06 4:52 Mike Frysinger (vapier)
2011-12-06 4:50 Mike Frysinger (vapier)
2011-12-06 4:15 Mike Frysinger (vapier)
2011-12-06 4:07 Mike Frysinger (vapier)
2011-12-04 22:59 Mike Frysinger (vapier)
2011-12-04 22:55 Mike Frysinger (vapier)
2011-12-04 22:23 Mike Frysinger (vapier)
2011-12-04 19:24 Mike Frysinger (vapier)
2011-12-03 20:45 Mike Frysinger (vapier)
2011-12-03 20:43 Mike Frysinger (vapier)
2011-12-03 2:06 Mike Frysinger (vapier)
2011-12-03 1:04 Mike Frysinger (vapier)
2011-12-02 23:39 Mike Frysinger (vapier)
2011-12-02 21:03 Mike Frysinger (vapier)
2011-11-30 23:53 Mike Frysinger (vapier)
2011-11-22 15:20 Mike Frysinger (vapier)
2011-11-20 20:12 Mike Frysinger (vapier)
2011-11-14 17:40 Mike Frysinger (vapier)
2011-11-09 17:25 Mike Frysinger (vapier)
2011-10-31 1:12 Mike Frysinger (vapier)
2011-10-31 1:10 Mike Frysinger (vapier)
2011-10-26 18:54 Magnus Granberg (zorry)
2011-10-17 19:10 Mike Frysinger (vapier)
2011-09-27 12:14 Mike Frysinger (vapier)
2011-09-26 20:39 Mike Frysinger (vapier)
2011-09-26 17:32 Mike Frysinger (vapier)
2011-09-22 23:08 Mike Frysinger (vapier)
2011-09-13 16:30 Mike Frysinger (vapier)
2011-09-12 5:40 Mike Frysinger (vapier)
2011-09-11 17:48 Mike Frysinger (vapier)
2011-09-11 17:14 Mike Frysinger (vapier)
2011-08-22 23:03 Matt Turner (mattst88)
2011-08-22 2:19 Mike Frysinger (vapier)
2011-08-13 3:09 Ryan Hill (dirtyepic)
2011-06-14 20:28 Matt Turner (mattst88)
2011-04-11 23:11 Ryan Hill (dirtyepic)
2011-04-10 18:21 Mike Frysinger (vapier)
2011-04-10 16:54 Mike Frysinger (vapier)
2011-03-24 8:37 Mike Frysinger (vapier)
2011-03-24 8:34 Mike Frysinger (vapier)
2011-03-24 8:30 Mike Frysinger (vapier)
2011-03-18 20:28 Mike Frysinger (vapier)
2011-03-11 15:32 Fabian Groffen (grobian)
2011-03-01 0:13 Mike Frysinger (vapier)
2011-02-13 12:10 Ryan Hill (dirtyepic)
2011-01-18 7:00 Ryan Hill (dirtyepic)
2011-01-18 1:42 Ryan Hill (dirtyepic)
2011-01-11 18:53 Fabian Groffen (grobian)
2011-01-08 7:44 Ryan Hill (dirtyepic)
2011-01-06 23:22 Ryan Hill (dirtyepic)
2010-12-29 7:31 Ryan Hill (dirtyepic)
2010-11-21 21:26 Mike Frysinger (vapier)
2010-11-21 21:25 Mike Frysinger (vapier)
2010-10-28 4:24 Mike Frysinger (vapier)
2010-10-10 7:32 Mike Frysinger (vapier)
2010-09-05 5:52 Ryan Hill (dirtyepic)
2010-08-14 1:26 Mike Frysinger (vapier)
2010-08-01 3:00 Ryan Hill (dirtyepic)
2010-07-22 1:26 Ryan Hill (dirtyepic)
2010-07-21 20:19 Luca Barbato (lu_zero)
2010-07-05 22:25 Mike Frysinger (vapier)
2010-07-05 22:22 Mike Frysinger (vapier)
2010-07-04 1:44 Magnus Granberg (zorry)
2010-06-27 3:54 Ryan Hill (dirtyepic)
2010-06-20 5:04 Mike Frysinger (vapier)
2010-06-18 10:13 Magnus Granberg (zorry)
2010-06-18 1:03 Magnus Granberg (zorry)
2010-06-02 21:31 Mike Frysinger (vapier)
2010-05-25 23:24 Ryan Hill (dirtyepic)
2010-04-25 18:04 Raul Porcel (armin76)
2010-04-24 23:53 Mark Loeser (halcy0n)
2010-04-23 18:58 Raul Porcel (armin76)
2010-04-20 17:47 Raul Porcel (armin76)
2010-04-03 20:32 Ryan Hill (dirtyepic)
2010-03-07 4:37 Mike Frysinger (vapier)
2010-03-06 14:50 Raul Porcel (armin76)
2010-02-28 18:26 Raul Porcel (armin76)
2010-02-27 20:54 Mark Loeser (halcy0n)
2010-01-09 20:42 Mike Frysinger (vapier)
2009-12-20 19:06 Mike Frysinger (vapier)
2009-12-20 14:30 Mike Frysinger (vapier)
2009-12-14 21:14 Harald van Dijk (truedfx)
2009-12-09 21:25 Mike Frysinger (vapier)
2009-12-04 15:00 Diego Petteno (flameeyes)
2009-10-19 1:49 Ryan Hill (dirtyepic)
2009-10-18 7:24 Mike Frysinger (vapier)
2009-10-12 19:01 Mike Frysinger (vapier)
2009-09-08 2:48 Mike Frysinger (vapier)
2009-08-13 18:15 Mark Loeser (halcy0n)
2009-07-26 20:10 Mark Loeser (halcy0n)
2009-07-05 19:56 Mike Frysinger (vapier)
2009-07-03 5:43 Mike Frysinger (vapier)
2009-06-09 20:59 Ryan Hill (dirtyepic)
2009-05-24 16:57 Raul Porcel (armin76)
2009-05-07 23:56 Mark Loeser (halcy0n)
2009-05-07 1:45 Mark Loeser (halcy0n)
2009-04-04 16:52 Fabian Groffen (grobian)
2009-03-15 7:13 Mike Frysinger (vapier)
2009-03-15 7:11 Mike Frysinger (vapier)
2009-03-01 20:41 Mike Frysinger (vapier)
2009-03-01 20:37 Mike Frysinger (vapier)
2009-02-15 23:04 Mike Frysinger (vapier)
2009-02-09 19:56 Markus Meier (maekke)
2009-01-29 6:06 Mike Frysinger (vapier)
2009-01-29 0:11 Mike Frysinger (vapier)
2009-01-28 23:40 Mike Frysinger (vapier)
2009-01-28 21:00 Mike Frysinger (vapier)
2009-01-28 5:22 Mike Frysinger (vapier)
2009-01-28 4:29 Mike Frysinger (vapier)
2009-01-28 2:27 Mike Frysinger (vapier)
2009-01-12 22:51 Markus Meier (maekke)
2009-01-10 12:53 Mike Frysinger (vapier)
2009-01-10 12:02 Mike Frysinger (vapier)
2009-01-06 3:53 Mike Frysinger (vapier)
2009-01-06 3:49 Mike Frysinger (vapier)
2009-01-05 22:02 Ned Ludd (solar)
2009-01-04 17:17 Mike Frysinger (vapier)
2009-01-02 0:09 Ned Ludd (solar)
2009-01-01 6:26 Gordon Malm (gengor)
2008-12-31 21:26 Ned Ludd (solar)
2008-12-29 22:46 Mike Frysinger (vapier)
2008-12-29 16:40 Raul Porcel (armin76)
2008-12-29 2:24 Ned Ludd (solar)
2008-12-22 18:53 Ned Ludd (solar)
2008-11-28 9:20 Mike Frysinger (vapier)
2008-11-09 20:27 Ned Ludd (solar)
2008-10-24 7:30 Joshua Kinard (kumba)
2008-10-20 1:04 Ryan Hill (dirtyepic)
2008-09-29 1:48 Mike Frysinger (vapier)
2008-08-20 3:15 Mike Frysinger (vapier)
2008-08-11 22:40 Mark Loeser (halcy0n)
2008-08-03 1:43 Mark Loeser (halcy0n)
2008-07-06 2:41 Mark Loeser (halcy0n)
2008-06-09 2:33 Mike Frysinger (vapier)
2008-04-22 19:26 Mike Frysinger (vapier)
2008-04-22 5:53 Mike Frysinger (vapier)
2008-04-12 22:54 Mike Frysinger (vapier)
2008-04-08 3:07 Mike Frysinger (vapier)
2008-04-08 0:12 Mike Frysinger (vapier)
2008-04-07 6:31 Mike Frysinger (vapier)
2008-03-23 16:33 Ryan Hill (dirtyepic)
2008-03-17 1:51 Mike Frysinger (vapier)
2008-02-16 22:27 Mike Frysinger (vapier)
2008-02-05 18:09 Thomas Alan Gall (tgall)
2007-12-01 18:33 Mike Frysinger (vapier)
2007-11-20 5:06 Mike Frysinger (vapier)
2007-11-12 19:33 Mike Frysinger (vapier)
2007-11-12 15:23 Diego Petteno (flameeyes)
2007-11-11 20:29 Mike Frysinger (vapier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox