blueness 15/02/05 23:28:17 Modified: ChangeLog toolchain.eclass Log: Restore the old way of dealing with fixed includes for bsd, bug #536878.
Revision Changes Path 1.1522 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1522&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1522&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1521&r2=1.1522 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1521 retrieving revision 1.1522 diff -u -r1.1521 -r1.1522 --- ChangeLog 4 Feb 2015 09:44:24 -0000 1.1521 +++ ChangeLog 5 Feb 2015 23:28:17 -0000 1.1522 @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1521 2015/02/04 09:44:24 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1522 2015/02/05 23:28:17 blueness Exp $ + + 05 Feb 2015; Anthony G. Basile <[email protected]> toolchain.eclass: + Restore the old way of dealing with fixed includes for bsd, bug #536878. 04 Feb 2015; Ulrich Müller <[email protected]> git-r3.eclass: Respect the EVCS_UMASK variable to override the default umask when writing 1.649 eclass/toolchain.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.649&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.649&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.648&r2=1.649 Index: toolchain.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v retrieving revision 1.648 retrieving revision 1.649 diff -u -r1.648 -r1.649 --- toolchain.eclass 21 Jan 2015 21:59:31 -0000 1.648 +++ toolchain.eclass 5 Feb 2015 23:28:17 -0000 1.649 @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# 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.648 2015/01/21 21:59:31 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.649 2015/02/05 23:28:17 blueness Exp $ # Maintainer: Toolchain Ninjas <[email protected]> @@ -595,15 +595,6 @@ 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() { @@ -1607,6 +1598,9 @@ 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 @@ -1617,6 +1611,17 @@ fi done + # We remove the generated fixincludes, as they can cause things to break + # (ncurses, openssl, etc). We do not prevent them from being built, as + # in the following commit which we revert: + # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.647&r2=1.648 + # This is because bsd userland needs fixedincludes to build gcc, while + # linux does not. Both can dispose of them afterwards. + 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
