From: Travis Tilley Date: Fri, 26 Nov 2004 03:18:56 +0000 (+0000) Subject: added a 20041125 branch update. made the logic for controlling {PIE,SSP}-by-default... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f59328c341aa2c803fc3dee679a0fa93ac2fbd7e;p=gentoo.git added a 20041125 branch update. made the logic for controlling {PIE,SSP}-by-default logic even more fine grained, and updated the pie patches to the latest version. --- diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog index 328e8d6ba932..417372fce703 100644 --- a/sys-devel/gcc/ChangeLog +++ b/sys-devel/gcc/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-devel/gcc # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.354 2004/11/21 16:58:56 lv Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.355 2004/11/26 03:18:56 lv Exp $ + +*gcc-3.4.3-r1 (25 Nov 2004) + + 25 Nov 2004; Travis Tilley +gcc-3.4.3-r1.ebuild: + added a 20041125 branch update. made the logic for controlling + {PIE,SSP}-by-default logic even more fine grained, and updated the pie + patches to the latest version. 21 Nov 2004; Travis Tilley -gcc-3.1.1-r2.ebuild, -gcc-3.3.1-r5.ebuild, -gcc-3.3.2-r1.ebuild, gcc-3.3.2-r2.ebuild, diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest index 2c0b105251f3..b4e8c57731c9 100644 --- a/sys-devel/gcc/Manifest +++ b/sys-devel/gcc/Manifest @@ -1,55 +1,45 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 aa93b74112e8711811616e18466bd9fb gcc-3.3.5.ebuild 11564 -MD5 25f23074a92fbb78410eac59a3ef412b ChangeLog 74075 -MD5 4bcf46d8a3f5509cf09f23017408095d gcc-2.95.3-r8.ebuild 8407 -MD5 9f2b75a5738fb492bdd6a50db9b1c8a0 gcc-3.2.3-r4.ebuild 19754 -MD5 287ae167b138e6c7acbdbae60ac8bf7a gcc-3.3.2-r2.ebuild 17924 -MD5 a48f0b2b1ee2697060cb2cd31a0e963d gcc-3.3.2-r5.ebuild 21248 -MD5 2e15fb1ef6dc858d2c0d8e8ea3a5dfeb gcc-3.3.2-r7.ebuild 21653 -MD5 483487724c94691b62abeb1a32023e9e gcc-3.3.2.ebuild 16758 MD5 872c3e4633f5a8414f8e2c004fa3b374 gcc-3.3.3-r3.ebuild 23468 MD5 6aa2c523e9534517a28400c1aa55358e gcc-3.3.3-r6.ebuild 24858 MD5 9b8536edd1111148d5a8ac9c3ab02288 gcc-3.3.4-r1.ebuild 24749 MD5 b52666d9d366f9dd02c00cdedb65b281 gcc-3.3.4-r2.ebuild 24553 -MD5 849d93a55dc7e809cf4e3e04b8444d95 gcc-3.4.1-r3.ebuild 31292 MD5 b51ad5b522016590a155af2ab03f4e20 gcc-3.4.2-r2.ebuild 13458 -MD5 453632339c41cdb4c4a6949c282556e2 gcc-3.4.3.ebuild 13325 +MD5 5235afe594170bf702b6e5c340eaedc5 gcc-3.4.3-r1.ebuild 13809 +MD5 483487724c94691b62abeb1a32023e9e gcc-3.3.2.ebuild 16758 +MD5 a48f0b2b1ee2697060cb2cd31a0e963d gcc-3.3.2-r5.ebuild 21248 +MD5 2e15fb1ef6dc858d2c0d8e8ea3a5dfeb gcc-3.3.2-r7.ebuild 21653 +MD5 849d93a55dc7e809cf4e3e04b8444d95 gcc-3.4.1-r3.ebuild 31292 +MD5 8b87137d8f7b8cff8e0b0cf01ad4c84a ChangeLog 74343 +MD5 4bcf46d8a3f5509cf09f23017408095d gcc-2.95.3-r8.ebuild 8407 +MD5 9f2b75a5738fb492bdd6a50db9b1c8a0 gcc-3.2.3-r4.ebuild 19754 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162 +MD5 287ae167b138e6c7acbdbae60ac8bf7a gcc-3.3.2-r2.ebuild 17924 +MD5 453632339c41cdb4c4a6949c282556e2 gcc-3.4.3.ebuild 13325 +MD5 aa93b74112e8711811616e18466bd9fb gcc-3.3.5.ebuild 11564 MD5 f7e7042c2ddf66e344b30cbc66ebaf73 files/cc 24 MD5 80d122265d3062847a4a1b161abe1d26 files/cpp 24 MD5 3213bd50acdbbd71ce7dd3e40710e30e files/digest-gcc-2.95.3-r8 64 +MD5 40e6872c09149a81973f01a78c80bbb7 files/digest-gcc-3.2.3-r4 279 +MD5 cf81ae4b2da79c34a005da1182c40134 files/digest-gcc-3.3.2 130 +MD5 f48105f24e5c714530e66a94aa56d615 files/digest-gcc-3.3.2-r2 361 +MD5 01c41c9e6857eb40d402f2acb2bd96f9 files/digest-gcc-3.3.2-r5 361 +MD5 e58b6c1f3122b79a5d0d273acc3c008c files/digest-gcc-3.3.2-r7 361 MD5 5a9db19cd5ad6ad16b0f838d525d842a files/digest-gcc-3.3.3-r3 522 -MD5 454652372363986ccf7974279150d516 files/digest-gcc-3.3.5 442 MD5 3fd5a29d44b89f4fb220fccaa968fc05 files/digest-gcc-3.3.3-r6 442 -MD5 d197c7ddd1a614b89bddbc3babb31c3b files/digest-gcc-3.4.3 442 -MD5 69687aac826654ad375b7eae45a01e0b files/digest-gcc-3.4.2-r2 443 MD5 6df16eb92245a931ecfc4cbcc73c84cf files/digest-gcc-3.3.4-r1 442 -MD5 cf81ae4b2da79c34a005da1182c40134 files/digest-gcc-3.3.2 130 -MD5 f48105f24e5c714530e66a94aa56d615 files/digest-gcc-3.3.2-r2 361 +MD5 6df16eb92245a931ecfc4cbcc73c84cf files/digest-gcc-3.3.4-r2 442 +MD5 c6ea8a92bac6d2638c54c011f98bc5b8 files/digest-gcc-3.4.1-r3 442 +MD5 69687aac826654ad375b7eae45a01e0b files/digest-gcc-3.4.2-r2 443 +MD5 d197c7ddd1a614b89bddbc3babb31c3b files/digest-gcc-3.4.3 442 MD5 9bb4a999eb75c9e3eadab9aa71e91879 files/fix_libtool_files.sh 1731 MD5 edced3dd7f4035b638bbee500bc89e7b files/gcc-spec-env.patch 791 -MD5 ea2cf3df0d89a26d5fdc1a531176e395 files/pro-police-docs.patch 3287 MD5 8baffb486c75efe253bd2daa88daa7d6 files/gcc331_use_multilib.amd64.patch 352 MD5 e3193bdffb435b77a21bfb504ff6f591 files/mkinfodir 7324 +MD5 ea2cf3df0d89a26d5fdc1a531176e395 files/pro-police-docs.patch 3287 MD5 07b57d62aa1a8cd4d1cd37984ebe2053 files/scan_libgcc_linked_ssp.sh 861 -MD5 01c41c9e6857eb40d402f2acb2bd96f9 files/digest-gcc-3.3.2-r5 361 -MD5 6df16eb92245a931ecfc4cbcc73c84cf files/digest-gcc-3.3.4-r2 442 -MD5 40e6872c09149a81973f01a78c80bbb7 files/digest-gcc-3.2.3-r4 279 -MD5 e58b6c1f3122b79a5d0d273acc3c008c files/digest-gcc-3.3.2-r7 361 -MD5 c6ea8a92bac6d2638c54c011f98bc5b8 files/digest-gcc-3.4.1-r3 442 +MD5 454652372363986ccf7974279150d516 files/digest-gcc-3.3.5 442 +MD5 cec861f8b98efbe0cf1cb250a5ac8322 files/digest-gcc-3.4.3-r1 444 MD5 b1a242694f56184cbcdd40ba25800d50 files/2.95.3/gcc-2.95.3-alpha.diff 14345 MD5 523970c128b929fe7c7cf36508ebd1d5 files/2.95.3/gcc-2.95.3-new-atexit.diff 13604 -MD5 27120401d2355e5d959b8d2d55eba310 files/3.3.4/gcc334-gentoo-branding.patch 876 -MD5 8c779f2dca6ab1b5b95e2ee211d26c8c files/3.3.4/gcc-3.3.4-spec-env.patch 786 -MD5 86ae592deb82c4564eb61f770fe5f8a7 files/3.4.1/gcc-3.4.1-gentoo-branding.patch 759 -MD5 df06b1cf70425c78e2e59136ed372ab4 files/3.4.1/gcc341-ppc64-mozilla-ICE-fix.patch 729 -MD5 14fec2000fc63536d4cf22195e88e14f files/3.4.1/gcc-3.4.1-r2-gentoo-branding.patch 781 -MD5 cd770c23ece7458db5e6c5067f262ce0 files/3.4.1/gcc-3.4.1-glibc-is-native.patch 760 -MD5 7cb2138ac2df6f8674d19974e966a45b files/3.4.1/gcc-3.4.1-mips-n32only.patch 614 -MD5 aa8e15a63d797df37bbd4e489ed0267f files/3.4.1/gcc-3.4.1-mips-n64only.patch 614 -MD5 97d7409ba5038bea85f9cabe023e28a6 files/3.4.1/gcc-3.4.1-spec-env.patch 755 MD5 8ec9b0352d226e4693cabffe0fa5bba6 files/3.2.1/gcc31-loop-load-final-value.patch 3324 MD5 5e8f2122ef7f9ce187b0a0d50ac9d24a files/3.2.1/gcc32-arm-disable-mathf.patch 2229 MD5 044a164462d9392aa67cde6f9fd5c1bc files/3.2.1/gcc32-arm-reload1-fix.patch 932 @@ -73,41 +63,43 @@ MD5 088e0807e677010cafe4e590e8711be1 files/3.3/gcc33-no-multilib-amd64.patch 343 MD5 453122edf63d75cca3a6c56a6dac45b0 files/3.3/gcc33-propolice-version.patch 570 MD5 d3e53318166d71a05d2b51bd44502270 files/3.3.1/gcc331-gentoo-branding.patch 874 MD5 b398b7415b93423ff04952c6e69bdb4d files/3.3.1/gcc331-pp-fixup.patch 407 -MD5 d9ae122db2768f8e504dfef256d4991f files/3.3.2/gcc332-gentoo-branding.patch 874 MD5 9e7ed6184a1cdcb69db29f1de26c2d18 files/3.3.2/gcc332-altivec-fix.patch 1607 -MD5 40eea3a959b76abb57fc629c029a3427 files/awk/fixlafiles.awk 7753 -MD5 c672adb59a1f452475ab0a864b9d1bd1 files/awk/scanforssp.awk 5830 +MD5 d9ae122db2768f8e504dfef256d4991f files/3.3.2/gcc332-gentoo-branding.patch 874 +MD5 66df5567226338b7504bbd3c25cea92c files/3.3.3/gcc-3.3.3-libiberty-pic.patch 370 +MD5 ee700275f341541af37d56bd15dcf863 files/3.3.3/gcc-3.3.3-norelro.patch 606 +MD5 ff6d7b5082c5e39fab8a5d8932c1a8b7 files/3.3.3/gcc-3.3.3-uclibc-add-ssp.patch 461 +MD5 308a0e53f03e9cb74b3d12c2633cbee2 files/3.3.3/gcc-uclibc-3.3-loop.patch 433 +MD5 9ba0bd0b103cf9535927ad7c482fe780 files/3.3.3/gcc333-debian-arm-getoff.patch 3501 +MD5 25eda9981106a55c413d1df3d3a87db5 files/3.3.3/gcc333-debian-arm-ldm.patch 3383 MD5 cd87c02e4896f47bf6029eef0dc29468 files/3.3.3/gcc333-gentoo-branding.patch 874 +MD5 e5812da37c1862908a29cdae004c4e52 files/3.3.3/gcc333-pr15693.patch 3927 +MD5 bb0078854a778b2a279cfb15d8933c29 files/3.3.3/gcc333-ssp-3.3.2_1-fixup.patch 2598 MD5 0e8d94bbc14fbb3fbad1df4f404b39ef files/3.3.3/gcc333-ssp-3.3_7-fixup.patch 2616 MD5 4b249bff27ab6328436e6289ac9f9cfc files/3.3.3/gcc333_pre20040215-gentoo-branding.patch 839 MD5 f317331e0b196ca455ca9554479cd8eb files/3.3.3/gcc333_pre20040322-gentoo-branding.patch 817 MD5 43c60f04779324d74d3aac52224bed95 files/3.3.3/gcc333_pre20040408-gentoo-branding.patch 820 MD5 3210d5fd70806c44d4426c3dceebd480 files/3.3.3/gcc333_pre20040408-stack-size.patch 653 MD5 43c60f04779324d74d3aac52224bed95 files/3.3.3/gcc333_pre20040426-gentoo-branding.patch 820 -MD5 9ba0bd0b103cf9535927ad7c482fe780 files/3.3.3/gcc333-debian-arm-getoff.patch 3501 -MD5 25eda9981106a55c413d1df3d3a87db5 files/3.3.3/gcc333-debian-arm-ldm.patch 3383 -MD5 ff6d7b5082c5e39fab8a5d8932c1a8b7 files/3.3.3/gcc-3.3.3-uclibc-add-ssp.patch 461 -MD5 308a0e53f03e9cb74b3d12c2633cbee2 files/3.3.3/gcc-uclibc-3.3-loop.patch 433 -MD5 bb0078854a778b2a279cfb15d8933c29 files/3.3.3/gcc333-ssp-3.3.2_1-fixup.patch 2598 -MD5 66df5567226338b7504bbd3c25cea92c files/3.3.3/gcc-3.3.3-libiberty-pic.patch 370 -MD5 ee700275f341541af37d56bd15dcf863 files/3.3.3/gcc-3.3.3-norelro.patch 606 -MD5 e5812da37c1862908a29cdae004c4e52 files/3.3.3/gcc333-pr15693.patch 3927 -MD5 b2922cfe76692e7d2b373a0a255f405e files/3.4.2/gcc-3.4.x-mips-add-march-r10k.patch 14248 -MD5 2970ce4d26f78bbb7e76f1d41a177bfb files/3.4.2/gcc34-fix-sse2_pinsrw.patch 901 -MD5 2c1ce849de55d8c81af4e081dbb2f5e4 files/3.4.2/gcc34-m32-no-sse2.patch 1058 -MD5 a720c913b78bcfbd7f63319130fadd4a files/3.4.2/810-arm-bigendian-uclibc.patch 1139 +MD5 8c779f2dca6ab1b5b95e2ee211d26c8c files/3.3.4/gcc-3.3.4-spec-env.patch 786 +MD5 27120401d2355e5d959b8d2d55eba310 files/3.3.4/gcc334-gentoo-branding.patch 876 +MD5 17b3190d64e34ed7709d022b326d08ae files/3.4.0/gcc-3.4.0-cc1-no-stack-protector.patch 563 +MD5 66edf32babf498517ca56fa44c901f26 files/3.4.0/gcc-3.4.0-move-propolice-into-glibc.patch 894 MD5 06580106a905e8fa2ff23aa190f9d82c files/3.4.0/gcc-3.4.0-r6-gentoo-branding.patch 781 MD5 c7ed491e4bcee6cae89067d4e1c899a8 files/3.4.0/gcc34-ia64-lib64.patch 1395 -MD5 66edf32babf498517ca56fa44c901f26 files/3.4.0/gcc-3.4.0-move-propolice-into-glibc.patch 894 -MD5 31470a0e018eb2cdfe68c71039ede80f files/3.4.0/gcc34-multi32-hack.patch 2445 MD5 c919e0a2cd429d0121b6133c1b4e41a6 files/3.4.0/gcc34-ice-hack.patch 8605 +MD5 31470a0e018eb2cdfe68c71039ede80f files/3.4.0/gcc34-multi32-hack.patch 2445 MD5 bae93db3186aa0fc25d659b7799ef499 files/3.4.0/gcc34-ppc64-m32-m64-multilib-only.patch 825 -MD5 17b3190d64e34ed7709d022b326d08ae files/3.4.0/gcc-3.4.0-cc1-no-stack-protector.patch 563 MD5 4edccdf0b4f6dbbc9f7bc9370c255e0c files/3.4.0/gcc34-reiser4-fix.patch 587 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.9.10 (GNU/Linux) - -iD8DBQFBolt4HTu7gpaalycRAhTVAJ9eVZsH8ljT8AJnX2W7WEPUGqcrZQCghkJe -VEMQGb6iUgrGBbMn3zAJL+Q= -=pzCA ------END PGP SIGNATURE----- +MD5 86ae592deb82c4564eb61f770fe5f8a7 files/3.4.1/gcc-3.4.1-gentoo-branding.patch 759 +MD5 cd770c23ece7458db5e6c5067f262ce0 files/3.4.1/gcc-3.4.1-glibc-is-native.patch 760 +MD5 7cb2138ac2df6f8674d19974e966a45b files/3.4.1/gcc-3.4.1-mips-n32only.patch 614 +MD5 aa8e15a63d797df37bbd4e489ed0267f files/3.4.1/gcc-3.4.1-mips-n64only.patch 614 +MD5 14fec2000fc63536d4cf22195e88e14f files/3.4.1/gcc-3.4.1-r2-gentoo-branding.patch 781 +MD5 97d7409ba5038bea85f9cabe023e28a6 files/3.4.1/gcc-3.4.1-spec-env.patch 755 +MD5 df06b1cf70425c78e2e59136ed372ab4 files/3.4.1/gcc341-ppc64-mozilla-ICE-fix.patch 729 +MD5 a720c913b78bcfbd7f63319130fadd4a files/3.4.2/810-arm-bigendian-uclibc.patch 1139 +MD5 b2922cfe76692e7d2b373a0a255f405e files/3.4.2/gcc-3.4.x-mips-add-march-r10k.patch 14248 +MD5 2970ce4d26f78bbb7e76f1d41a177bfb files/3.4.2/gcc34-fix-sse2_pinsrw.patch 901 +MD5 2c1ce849de55d8c81af4e081dbb2f5e4 files/3.4.2/gcc34-m32-no-sse2.patch 1058 +MD5 40eea3a959b76abb57fc629c029a3427 files/awk/fixlafiles.awk 7753 +MD5 c672adb59a1f452475ab0a864b9d1bd1 files/awk/scanforssp.awk 5830 diff --git a/sys-devel/gcc/files/digest-gcc-3.4.3-r1 b/sys-devel/gcc/files/digest-gcc-3.4.3-r1 new file mode 100644 index 000000000000..ceaad4aa1a94 --- /dev/null +++ b/sys-devel/gcc/files/digest-gcc-3.4.3-r1 @@ -0,0 +1,6 @@ +MD5 e744b30c834360fccac41eb7269a3011 gcc-3.4.3.tar.bz2 27425338 +MD5 7e9f1e950d4d0bada222468b05624641 gcc-3.4.3-branch-update-20041125.patch.bz2 601828 +MD5 6b8482fc1bd2663b1b54939f14090331 protector-3.4.3-0.tar.gz 32299 +MD5 7e13ac1ac8a87cc5bffee82e0436230d gcc-3.4.3-manpages.tar.bz2 264998 +MD5 3d7c6afee2e68f10c55f54ce87395876 gcc-3.4.3-patches-1.1.tar.bz2 91779 +MD5 70eb99d2eac647ce956eff950958f7fd gcc-3.4.3-piepatches-v8.7.6.7.tar.bz2 14296 diff --git a/sys-devel/gcc/gcc-3.4.3-r1.ebuild b/sys-devel/gcc/gcc-3.4.3-r1.ebuild new file mode 100644 index 000000000000..24d853af4e8a --- /dev/null +++ b/sys-devel/gcc/gcc-3.4.3-r1.ebuild @@ -0,0 +1,474 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.3-r1.ebuild,v 1.1 2004/11/26 03:18:56 lv Exp $ + +DESCRIPTION="The GNU Compiler Collection. Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking" +HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html" + +LICENSE="GPL-2 LGPL-2.1" +#KEYWORDS="-* ~amd64 ~mips ~ppc64 ~x86 -hppa ~ppc ~sparc" +KEYWORDS="-*" + +# we need a proper glibc version for the Scrt1.o provided to the pie-ssp specs +# NOTE: we SHOULD be using at least binutils 2.15.90.0.1 everywhere for proper +# .eh_frame ld optimisation and symbol visibility support, but it hasnt been +# well tested in gentoo on any arch other than amd64!! +RDEPEND="virtual/libc + >=sys-devel/gcc-config-1.3.1 + >=sys-libs/zlib-1.1.4 + !sys-devel/hardened-gcc + !uclibc? ( + >=sys-libs/glibc-2.3.3_pre20040420-r1 + hardened? ( >=sys-libs/glibc-2.3.3_pre20040529 ) + ) + amd64? ( multilib? ( >=app-emulation/emul-linux-x86-glibc-1.1 ) ) + !build? ( + gcj? ( + gtk? ( >=x11-libs/gtk+-2.2 ) + >=media-libs/libart_lgpl-2.1 + ) + >=sys-libs/ncurses-5.2-r2 + nls? ( sys-devel/gettext ) + )" +DEPEND="${RDEPEND} + >=sys-apps/texinfo-4.2-r4 + >=sys-devel/bison-1.875 + >=sys-devel/binutils-2.14.90.0.8-r1 + amd64? ( >=sys-devel/binutils-2.15.90.0.1.1-r1 )" +PDEPEND="sys-devel/gcc-config + !nocxx? ( !mips? ( !uclibc? ( !build? ( sys-libs/libstdc++-v3 ) ) ) )" + + +GENTOO_TOOLCHAIN_BASE_URI="http://dev.gentoo.org/~lv/GCC/" +#GCC_MANPAGE_VERSION="none" +BRANCH_UPDATE="20041125" +PATCH_VER="1.1" +PIE_VER="8.7.6.7" +PIE_CORE="gcc-3.4.3-piepatches-v${PIE_VER}.tar.bz2" +PP_VER="3_4_3" +PP_FVER="${PP_VER//_/.}-0" +HTB_VER="1.00" +HTB_GCC_VER="3.4.2" + +# nothing in the tree supports libssp +#GCC_LIBSSP_SUPPORT="true" + +ETYPE="gcc-compiler" + +# arch/libc configurations known to be stable with {PIE,SSP}-by-default +SSP_STABLE="x86 sparc amd64" +SSP_UCLIBC_STABLE="" +PIE_GLIBC_STABLE="x86 sparc amd64" +PIE_UCLIBC_STABLE="x86 mips ppc" + +# arch/libc configurations known to be broken with {PIE,SSP}-by-default +SSP_UNSUPPORTED="hppa" +SSP_UCLIBC_UNSUPPORTED="${SSP_UNSUPPORTED}" +PIE_UCLIBC_UNSUPPORTED="alpha amd64 arm hppa ia64 m68k ppc64 s390 sh sparc" +PIE_GLIBC_UNSUPPORTED="hppa" + +# whether we should split out specs files for multiple {PIE,SSP}-by-default +# and vanilla configurations. +SPLIT_SPECS="${SPLIT_SPECS:="true"}" + +#GENTOO_PATCH_EXCLUDE="" +#PIEPATCH_EXCLUDE="" + +inherit eutils flag-o-matic libtool gnuconfig toolchain + +gcc_do_filter_flags() { + strip-flags + + # In general gcc does not like optimization, and add -O2 where + # it is safe. This is especially true for gcc 3.3 + 3.4 + replace-flags -O? -O2 + + # -mcpu is deprecated on these archs, and possibly others + if use amd64 || use x86 ; then + setting="`get-flag mcpu`" + [ ! -z "${setting}" ] && \ + replace-flags -mcpu="${setting}" -mtune="${setting}" && \ + ewarn "-mcpu is deprecated on your arch\a\a\a" && \ + epause 5 + fi + + strip-unsupported-flags + + # If we use multilib on mips, we shouldn't pass -mabi flag - it breaks + # build of non-default-abi libraries. + use mips && use multilib && filter-flags "-mabi*" + + # Compile problems with these (bug #6641 among others)... + #filter-flags "-fno-exceptions -fomit-frame-pointer -fforce-addr" + + export GCJFLAGS="${CFLAGS}" +} + + +chk_gcc_version() { + mkdir -p "${WORKDIR}" + + # This next bit is for updating libtool linker scripts ... + local OLD_GCC_VERSION="`gcc -dumpversion`" + local OLD_GCC_CHOST="$(gcc -v 2>&1 | egrep '^Reading specs' |\ + sed -e 's:^.*/gcc[^/]*/\([^/]*\)/[0-9]\+.*$:\1:')" + + if [ "${OLD_GCC_VERSION}" != "${MY_PV_FULL}" ] + then + echo "${OLD_GCC_VERSION}" > "${WORKDIR}/.oldgccversion" + fi + + if [ -n "${OLD_GCC_CHOST}" ] + then + if [ "${CHOST}" = "${CTARGET}" -a "${OLD_GCC_CHOST}" != "${CHOST}" ] + then + echo "${OLD_GCC_CHOST}" > "${WORKDIR}/.oldgccchost" + fi + fi + + # Did we check the version ? + touch "${WORKDIR}/.chkgccversion" +} + +src_unpack() { + # if sandbox is enabled, and multilib is enabled, but we dont have a 32bit + # sandbox... installing gcc will fail as soon as it starts configuring the + # 32bit libstdc++. not fun. + if use amd64 && use multilib && hasq sandbox $FEATURES && [ ! -e /lib32/libsandbox.so ] ; then + eerror "You need a 32bit sandbox to install 32bit code with sandbox" + eerror "enabled. Either add FEATURES=-sandbox or disable multilib." + eerror "After installing a multilib gcc, you can re-emerge portage" + eerror "to get a 32bit sandbox, and this problem will go away." + ebeep + die "no 32bit sandbox" + fi + + gcc_src_unpack + + # bah + sed -e 's/3\.4\.4/3.4.3/' -i ${S}/gcc/version.c + + # misc patches that havent made it into a patch tarball yet + epatch ${FILESDIR}/3.4.0/gcc34-reiser4-fix.patch + epatch ${FILESDIR}/gcc-spec-env.patch + epatch ${FILESDIR}/3.4.2/810-arm-bigendian-uclibc.patch + + # If mips, and we DON'T want multilib, then rig gcc to only use n32 OR n64 + if use mips && use !multilib; then + use n32 && epatch ${FILESDIR}/3.4.1/gcc-3.4.1-mips-n32only.patch + use n64 && epatch ${FILESDIR}/3.4.1/gcc-3.4.1-mips-n64only.patch + fi + + # Patch forward-ported from a gcc-3.0.x patch that adds -march=r10000 and + # -mtune=r10000 support to gcc (Allows the compiler to generate code to + # take advantage of R10k's second ALU, perform shifts, etc.. + # Needs re-porting for DFA in gcc-4.0 + if use mips; then + epatch ${FILESDIR}/3.4.2/gcc-3.4.x-mips-add-march-r10k.patch + fi + + # hack around some ugly 32bit sse2 wrong-code bugs + epatch ${FILESDIR}/3.4.2/gcc34-m32-no-sse2.patch + epatch ${FILESDIR}/3.4.2/gcc34-fix-sse2_pinsrw.patch + + if use amd64 && use multilib ; then + # this should hack around the GCC_NO_EXECUTABLES bug + epatch ${FILESDIR}/3.4.1/gcc-3.4.1-glibc-is-native.patch + cd ${S}/libstdc++-v3 + einfo "running autoreconf..." + autoreconf 2> /dev/null + cd ${S} + fi +} + + +src_install() { + local x= + + # Do allow symlinks in ${LOC}/lib/gcc-lib/${CHOST}/${PV}/include as + # this can break the build. + for x in ${WORKDIR}/build/gcc/include/* + do + if [ -L ${x} ] + then + rm -f ${x} + continue + fi + 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 + if grep -q 'It has been auto-edited by fixincludes from' ${x} + then + rm -f ${x} + fi + done + + einfo "Installing GCC..." + # Do the 'make install' from the build directory + cd ${WORKDIR}/build + S="${WORKDIR}/build" \ + make DESTDIR="${D}" install || die + + if [ "${CHOST}" == "${CTARGET}" ] ; then + [ -r ${D}${BINPATH}/gcc ] || die "gcc not found in ${D}" + fi + + dodir /lib /usr/bin + 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 + + cp ${WORKDIR}/build/*.specs ${D}/${LIBPATH} + fi + + # Make sure we dont have stuff lying around that + # can nuke multiple versions of gcc + if ! use build + then + cd ${D}${LIBPATH} + + # Tell libtool files where real libraries are + for x in ${D}${LOC}/lib/*.la ${D}${LIBPATH}/../*.la + do + if [ -f "${x}" ] + then + sed -i -e "s:/usr/lib:${LIBPATH}:" ${x} + mv ${x} ${D}${LIBPATH} + fi + done + + # Move all the libraries to version specific libdir. + for x in ${D}${PREFIX}/lib/*.{so,a}* ${D}${LIBPATH}/../*.{so,a}* + do + [ -f "${x}" -o -L "${x}" ] && mv -f ${x} ${D}${LIBPATH} + done + + # 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 - extension) + cd ${D}${PREFIX}/${CTARGET}/gcc-bin/${MY_PV_FULL} + [ -f jar ] && mv -f jar gcj-jar + + # Move to compiler-specific directories + [ -f "${D}${STDCXX_INCDIR}/cxxabi.h" ] && \ + mv -f ${D}${STDCXX_INCDIR}/cxxabi.h ${D}${LIBPATH}/include/ + + # These should be symlinks + cd ${D}${BINPATH} + for x in gcc g++ c++ g77 gcj + do + if [ "${CHOST}" == "${CTARGET}" ] && [ -f "${CTARGET}-${x}" ] + then + [ ! -f "${x}" ] && mv "${CTARGET}-${x}" "${x}" + ln -sf ${x} ${CTARGET}-${x} + fi + + if [ -f "${CTARGET}-${x}-${PV}" ] + then + rm -f ${CTARGET}-${x}-${PV} + ln -sf ${CTARGET}-${x} ${CTARGET}-${x}-${PV} + fi + done + fi + + # This one comes with binutils + rm -f ${D}${PREFIX}/lib/libiberty.a + rm -f ${D}${LIBPATH}/libiberty.a + + [ -e ${D}/${PREFIX}/lib/32 ] && rm -rf ${D}/${PREFIX}/lib/32 + + cd ${S} + if ! use build && [ "${CHOST}" == "${CTARGET}" ] ; then + cd ${S} + docinto ${CTARGET} + dodoc ChangeLog* FAQ MAINTAINERS README + docinto ${CTARGET}/html + dohtml *.html + cd ${S}/boehm-gc + docinto ${CTARGET}/boehm-gc + dodoc ChangeLog doc/{README*,barrett_diagram} + docinto ${CTARGET}/boehm-gc/html + dohtml doc/*.html + cd ${S}/gcc + docinto ${CTARGET}/gcc + dodoc ChangeLog* FSFChangeLog* LANGUAGES NEWS ONEWS README* SERVICE + if use fortran ; then + cd ${S}/libf2c + docinto ${CTARGET}/libf2c + dodoc ChangeLog* README TODO *.netlib + fi + cd ${S}/libffi + docinto ${CTARGET}/libffi + dodoc ChangeLog* README + cd ${S}/libiberty + docinto ${CTARGET}/libiberty + dodoc ChangeLog* README + if use objc + then + cd ${S}/libobjc + docinto ${CTARGET}/libobjc + dodoc ChangeLog* README* THREADS* + fi + cd ${S}/libstdc++-v3 + docinto ${CTARGET}/libstdc++-v3 + dodoc ChangeLog* README + docinto ${CTARGET}/libstdc++-v3/html + dohtml -r -a css,diff,html,txt,xml docs/html/* + cp -f docs/html/17_intro/[A-Z]* \ + ${D}/usr/share/doc/${PF}/${DOCDESTTREE}/17_intro/ + + if use gcj + then + cd ${S}/fastjar + docinto ${CTARGET}/fastjar + dodoc AUTHORS CHANGES ChangeLog* NEWS README + cd ${S}/libjava + docinto ${CTARGET}/libjava + dodoc ChangeLog* HACKING NEWS README THANKS + fi + + prepman ${DATAPATH} + prepinfo ${DATAPATH} + else + rm -rf ${D}/usr/share/{man,info} + rm -rf ${D}${DATAPATH}/{man,info} + fi + + # Rather install the script, else portage with changing $FILESDIR + # between binary and source package borks things .... + if [ "${CHOST}" == "${CTARGET}" ] ; then + insinto /lib/rcscripts/awk + doins ${FILESDIR}/awk/fixlafiles.awk + exeinto /sbin + doexe ${FILESDIR}/fix_libtool_files.sh + fi + + # we dont want these in freaky non-versioned paths that dont ever get used + fix_freaky_non_versioned_library_paths_that_dont_ever_get_used 32 + fix_freaky_non_versioned_library_paths_that_dont_ever_get_used 64 + # and mips is just freaky in general ;p + fix_freaky_non_versioned_library_paths_that_dont_ever_get_used o32 + # and finally, the non-bitdepth-or-ABI-specific freaky path + if [ -d ${D}/${LIBPATH}/../lib ] ; then + mv ${D}/${LIBPATH}/../lib/* ${D}/${LIBPATH}/ + rm -rf ${D}/${LIBPATH}/../lib + fi +} + +fix_freaky_non_versioned_library_paths_that_dont_ever_get_used() { + # first the multilib case + if [ -d ${D}/${LIBPATH}/../$1 -a -d ${D}/${LIBPATH}/$1 ] ; then + mv ${D}/${LIBPATH}/../$1/* ${D}/${LIBPATH}/$1/ + rm -rf ${D}/${LIBPATH}/../$1 + fi + if [ -d ${D}/${LIBPATH}/../lib$1 -a -d ${D}/${LIBPATH}/$1 ] ; then + mv ${D}/${LIBPATH}/../lib$1/* ${D}/${LIBPATH}/$1/ + rm -rf ${D}/${LIBPATH}/../lib$1 + fi + # and now to fix up the non-multilib case + if [ -d ${D}/${LIBPATH}/../$1 -a ! -d ${D}/${LIBPATH}/$1 ] ; then + mv ${D}/${LIBPATH}/../$1/* ${D}/${LIBPATH}/ + rm -rf ${D}/${LIBPATH}/../$1 + fi + if [ -d ${D}/${LIBPATH}/../lib$1 -a ! -d ${D}/${LIBPATH}/$1 ] ; then + mv ${D}/${LIBPATH}/../lib$1/* ${D}/${LIBPATH}/ + rm -rf ${D}/${LIBPATH}/../lib$1 + fi +} + + +pkg_preinst() { + + if [ ! -f "${WORKDIR}/.chkgccversion" ] + then + mkdir -p ${WORKDIR} + chk_gcc_version + fi + + # Make again sure that the linker "should" be able to locate + # libstdc++.so ... + if use multilib && [ "${ARCH}" = "amd64" ] + then + # Can't always find libgcc_s.so.1, make it find it + export LD_LIBRARY_PATH="${LIBPATH}:${LIBPATH}/../lib64:${LIBPATH}/../lib32:${LD_LIBRARY_PATH}" + else + export LD_LIBRARY_PATH="${LIBPATH}:${LD_LIBRARY_PATH}" + fi + ${ROOT}/sbin/ldconfig +} + +pkg_postinst() { + + if use multilib && [ "${ARCH}" = "amd64" ] + then + # Can't always find libgcc_s.so.1, make it find it + export LD_LIBRARY_PATH="${LIBPATH}:${LIBPATH}/../lib64:${LIBPATH}/../lib32:${LD_LIBRARY_PATH}" + else + export LD_LIBRARY_PATH="${LIBPATH}:${LD_LIBRARY_PATH}" + fi + + should_we_gcc_config && do_gcc_config + + # Update libtool linker scripts to reference new gcc version ... + if [ "${ROOT}" = "/" ] && \ + [ -f "${WORKDIR}/.oldgccversion" -o -f "${WORKDIR}/.oldgccchost" ] + then + local OLD_GCC_VERSION= + local OLD_GCC_CHOST= + + if [ -f "${WORKDIR}/.oldgccversion" ] && \ + [ -n "$(cat "${WORKDIR}/.oldgccversion")" ] + then + OLD_GCC_VERSION="$(cat "${WORKDIR}/.oldgccversion")" + else + OLD_GCC_VERSION="${MY_PV_FULL}" + fi + + if [ -f "${WORKDIR}/.oldgccchost" ] && \ + [ -n "$(cat "${WORKDIR}/.oldgccchost")" ] + then + OLD_GCC_CHOST="--oldarch $(cat "${WORKDIR}/.oldgccchost")" + fi + + /sbin/fix_libtool_files.sh ${OLD_GCC_VERSION} ${OLD_GCC_CHOST} + fi +} +