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 <toolch...@gentoo.org> @@ -595,6 +595,15 @@ einfo " ${f%%...}" done fi + + # We don't need fixed header files. This is a gcc hack for dealing with broken + # (ie non-ansi compliant) header files on old unix systems. On modern systems, + # these "fixed" headers are known to break things. We just stub them out. + if tc_version_is_at_least 4.0; then + echo : > "${S}"/fixincludes/fixinc.in || die + else + echo : > "${S}"/gcc/fixinc/fixincl.sh || die + fi } guess_patch_type_in_dir() { @@ -1598,9 +1607,6 @@ toolchain_src_install() { cd "${WORKDIR}"/build - # Do allow symlinks in private gcc include dir as this can break the build - find gcc/include*/ -type l -delete - # Copy over the info pages. We disabled their generation earlier, but the # build system only expects to install out of the build dir, not the source. #464008 mkdir -p gcc/doc @@ -1611,13 +1617,6 @@ fi done - # Remove generated headers, as they can cause things to break - # (ncurses, openssl, etc). - while read x ; do - grep -q 'It has been auto-edited by fixincludes from' "${x}" \ - && rm -f "${x}" - done < <(find gcc/include*/ -name '*.h') - # Do the 'make install' from the build directory S="${WORKDIR}"/build emake -j1 DESTDIR="${D}" install || die
