From 39cbbf93f9cf040ee5cf2d80fa73afcb834f4655 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Mon, 25 Feb 2013 10:24:44 +0000 Subject: [PATCH] [sys-devel/gcc] version bump 4.5 slot to 4.5.4 --- sys-devel/base-gcc/Manifest | 4 + sys-devel/base-gcc/base-gcc-4.5.4.ebuild | 176 +++++++++++++++++++++++ sys-devel/gcc/Manifest | 4 + sys-devel/gcc/gcc-4.5.4.ebuild | 113 +++++++++++++++ 4 files changed, 297 insertions(+) create mode 100644 sys-devel/base-gcc/base-gcc-4.5.4.ebuild create mode 100644 sys-devel/gcc/gcc-4.5.4.ebuild diff --git a/sys-devel/base-gcc/Manifest b/sys-devel/base-gcc/Manifest index 2f67050be..270b8091f 100644 --- a/sys-devel/base-gcc/Manifest +++ b/sys-devel/base-gcc/Manifest @@ -4,6 +4,10 @@ DIST gcc-4.5.3-patches-1.1.tar.bz2 20627 SHA256 171348adbdbf3eeb26f47be414a47591 DIST gcc-4.5.3-piepatches-v0.4.7.tar.bz2 14638 SHA256 fe3414a85b6b0a1e4ff758c008bbefc7411148ccb9af70cb1a0af179eba55a32 DIST gcc-4.5.3-uclibc-patches-1.0.tar.bz2 3015 SHA256 7ddb8ac57b42c0de07a9afb3338c05d884da3c606f80cf21ee767f9c4682e3f6 DIST gcc-4.5.3.tar.bz2 66374586 SHA256 0a8847af44a9b33813b199997a73139517c96adfd519eaf24c79d4d9d09f65de +DIST gcc-4.5.4-patches-1.1.tar.bz2 21867 SHA256 6691b3ffb0f684308a23f0db7df1786f07a14bdaa5b7a828a0337c780fcb958e SHA512 959b458a5f1fda4f8ce2a3826206b3dcaa6b98f860cff9376ab2e8b7d5a924b2d07eda1050153999662cdc64cbfb4de22146e7bab10fa6c0a1f7874443d952f1 WHIRLPOOL 43c687d51cda3a54e0e74f109fbd2f29d041609434500b79ff194f1b67336d3644746cd33d0a1a42c31ed069fb9e83dadc2e0075f9e6a42b0590e63acfd962c1 +DIST gcc-4.5.4-piepatches-v0.4.7.tar.bz2 14636 SHA256 cde859de93194d1ad568932bdd490b47b9bfc6cf82e68d5b67ad117c3079d426 SHA512 2e59910f2919817f168d99406559d9e94978020adbc39d061a03dcbcb4a38635ff3c501d04f84c9e6023812ae1d88f54c22f2f2cf6723a76da2fadb2648e11d8 WHIRLPOOL 10001812c6e6693647465b197ed4738fe52e3c53752a551d646ab9d77ade9dfdf46e4b80ecf4b647ec865168e80c4a0bf350659b3ab11251a173179244b44972 +DIST gcc-4.5.4-uclibc-patches-1.0.tar.bz2 3019 SHA256 bcfaac58ee057ca9fdbee9295100379051b3b7df8abdf33f24da6cb3c75b4d20 SHA512 b6aa0a7d029a2a00b36fe8906d76b434fcdfc7191cbc8fffbcb8b89a66eba61ba6cd0cfdba94a79929487fbbad2163083b085476498f8be77ad473d078b0095a WHIRLPOOL f3cae558649cdbce9a7dbf0d006845d88349926d1e3d7a4717f2df5c413a1da236b9e35fe0618844578408825b6130533570146c525525a0df18223b3ebf479f +DIST gcc-4.5.4.tar.bz2 66426133 SHA256 eef3f0456db8c3d992cbb51d5d32558190bc14f3bc19383dd93acc27acc6befc SHA512 78696b287d46aacd6f150920da376ea32f58ad9f0dafd2d3b7fa6dbdd8dd7afe659108d1dfaa5807617fc5248719f50b39c37ade0173ea5b9fec2091f4656115 WHIRLPOOL 1d3aa5f344171a75144118101bf475536940eeb80f73849827ee4103c52dfb6504d9b26e21fa0984c65c5e6267e02fa6e7f8ef539c44f45470790781080aadca DIST gcc-4.6.2-patches-1.0.tar.bz2 12374 SHA256 a6fd308469094095891ba003b9c3c2d4c8bf35713df987609b675f04a43e83df DIST gcc-4.6.2-piepatches-v0.4.5.tar.bz2 14156 SHA256 a18bea1bc2cad2efde5481a5777a97cf539d206dcbca33758d56d7fbdb43a554 DIST gcc-4.6.2-uclibc-patches-1.0.tar.bz2 3019 SHA256 25e902a6d2db7181394df5ad11fafaad064bf28a6ffebd889033f744613ac201 diff --git a/sys-devel/base-gcc/base-gcc-4.5.4.ebuild b/sys-devel/base-gcc/base-gcc-4.5.4.ebuild new file mode 100644 index 000000000..1b3ecc749 --- /dev/null +++ b/sys-devel/base-gcc/base-gcc-4.5.4.ebuild @@ -0,0 +1,176 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +PATCH_VER="1.1" +UCLIBC_VER="1.0" + +# Hardened gcc 4 stuff +PIE_VER="0.4.7" +SPECS_VER="0.2.0" +SPECS_GCC_VER="4.4.3" +# arch/libc configurations known to be stable with {PIE,SSP}-by-default +PIE_GLIBC_STABLE="x86 amd64 ppc ppc64 arm ia64" +PIE_UCLIBC_STABLE="x86 arm amd64 ppc ppc64" +SSP_STABLE="amd64 x86 ppc ppc64 arm" +# uclibc need tls and nptl support for SSP support +SSP_UCLIBC_STABLE="" +#end Hardened stuff + +inherit toolchain + +DESCRIPTION="The GNU Compiler Collection" + +LICENSE="GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2" +KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" + +RDEPEND=">=sys-libs/zlib-1.1.4 + >=sys-devel/gcc-config-1.4 + virtual/libiconv + >=dev-libs/gmp-4.3.2 + >=dev-libs/mpfr-2.4.2 + >=dev-libs/mpc-0.8.1 + graphite? ( + >=dev-libs/ppl-0.10 + >=dev-libs/cloog-ppl-0.15.8 + ) + lto? ( || ( >=dev-libs/elfutils-0.143 dev-libs/libelf ) ) + !build? ( + >=sys-libs/ncurses-5.2-r2 + nls? ( sys-devel/gettext ) + )" + +DEPEND="${RDEPEND} + test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) + >=sys-apps/texinfo-4.8 + >=sys-devel/bison-1.875 + elibc_glibc? ( >=sys-libs/glibc-2.8 ) + ppc? ( >=${CATEGORY}/binutils-2.17 ) + ppc64? ( >=${CATEGORY}/binutils-2.17 ) + >=${CATEGORY}/binutils-2.15.94" +PDEPEND=">=sys-devel/gcc-config-1.4" + +## No changes +src_unpack() { + toolchain_src_unpack + + use vanilla && return 0 + + sed -i 's/use_fixproto=yes/:/' gcc/config.gcc #PR33200 + + [[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch +} + +## Remove lto conditional +pkg_setup() { + toolchain_pkg_setup +} + +## Just install libgcc stuff +src_install() { + cd "${WORKDIR}/build" + S="${WORKDIR}"/build \ + emake -j1 -C "${CTARGET}/libgcc" DESTDIR="${D}" install-shared || die + if use multilib; then + S="${WORKDIR}"/build emake -j1 -C "${CTARGET}/32/libgcc" DESTDIR="${D}" \ + install-shared || die + fi + + if use mudflap; then + S="${WORKDIR}"/build emake -j1 -C "${CTARGET}/libmudflap" DESTDIR="${D}" \ + install-toolexeclibLTLIBRARIES || die + if use multilib; then + S="${WORKDIR}"/build emake -j1 -C "${CTARGET}/32/libmudflap" DESTDIR="${D}" \ + install-toolexeclibLTLIBRARIES || die + fi + fi + + if use openmp; then + S="${WORKDIR}"/build emake -j1 -C "${CTARGET}/libgomp" DESTDIR="${D}" \ + install-toolexeclibLTLIBRARIES || die + if use multilib; then + S="${WORKDIR}"/build emake -j1 -C "${CTARGET}/32/libgomp" DESTDIR="${D}" \ + install-toolexeclibLTLIBRARIES || die + fi + fi + + S="${WORKDIR}"/build \ + emake -j1 -C "${CTARGET}/libstdc++-v3/src" DESTDIR="${D}" \ + install-toolexeclibLTLIBRARIES || die + if use multilib; then + S="${WORKDIR}"/build emake -j1 -C "${CTARGET}/32/libstdc++-v3/src" DESTDIR="${D}" \ + install-toolexeclibLTLIBRARIES || die + fi + + + S="${WORKDIR}"/build emake -j1 -C "${CTARGET}/libstdc++-v3/po" DESTDIR="${D}" install || die + S="${WORKDIR}"/build emake -j1 -C "${CTARGET}/libgomp" DESTDIR="${D}" install-info || die + + # GCC 4.6 only + #S="${WORKDIR}"/build emake -j1 DESTDIR="${D}" install-target-libquadmath || die + if use fortran; then + S="${WORKDIR}"/build emake -j1 DESTDIR="${D}" install-target-libgfortran || die + fi + # TODO: what to do with USE objc++ and objc-gc ? + if use objc; then + S="${WORKDIR}"/build emake -j1 DESTDIR="${D}" install-target-libobjc || die + fi + + # from toolchain.eclass yay + gcc_movelibs + + dodir /etc/env.d/gcc + create_gcc_env_entry + + # Setup the gcc_env_entry for hardened gcc 4 with minispecs + if want_minispecs ; then + copy_minispecs_gcc_specs + fi + + # drop any .la, .a + find "${D}" -name *.a -delete + find "${D}" -name *.la -delete + + # drop any include + rm "${D}${LIBPATH}"/include -rf + + # drop specs as well, provided by sys-devel/gcc-${PV}:${SLOT} + # unfortunately, the spec shit above does create the env.d/ + # file content... + rm "${D}${LIBPATH}"/{32/,}*.spec{s,} -rf + rm "${D}${LIBPATH}"/specs -rf + + # Now do the fun stripping stuff + env RESTRICT="" CHOST=${CTARGET} prepstrip "${D}${LIBPATH}" + + cd "${S}" + if ! is_crosscompile; then + has noinfo ${FEATURES} \ + && rm -r "${D}/${DATAPATH}"/info \ + || prepinfo "${DATAPATH}" + 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} +} + +## Do nothing! +pkg_preinst() { + : +} + +## Do nothing! +pkg_postinst() { + : +} + +## Do nothing! +pkg_prerm() { + : +} + +## Do nothing! +pkg_postrm() { + : +} diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest index 2f67050be..270b8091f 100644 --- a/sys-devel/gcc/Manifest +++ b/sys-devel/gcc/Manifest @@ -4,6 +4,10 @@ DIST gcc-4.5.3-patches-1.1.tar.bz2 20627 SHA256 171348adbdbf3eeb26f47be414a47591 DIST gcc-4.5.3-piepatches-v0.4.7.tar.bz2 14638 SHA256 fe3414a85b6b0a1e4ff758c008bbefc7411148ccb9af70cb1a0af179eba55a32 DIST gcc-4.5.3-uclibc-patches-1.0.tar.bz2 3015 SHA256 7ddb8ac57b42c0de07a9afb3338c05d884da3c606f80cf21ee767f9c4682e3f6 DIST gcc-4.5.3.tar.bz2 66374586 SHA256 0a8847af44a9b33813b199997a73139517c96adfd519eaf24c79d4d9d09f65de +DIST gcc-4.5.4-patches-1.1.tar.bz2 21867 SHA256 6691b3ffb0f684308a23f0db7df1786f07a14bdaa5b7a828a0337c780fcb958e SHA512 959b458a5f1fda4f8ce2a3826206b3dcaa6b98f860cff9376ab2e8b7d5a924b2d07eda1050153999662cdc64cbfb4de22146e7bab10fa6c0a1f7874443d952f1 WHIRLPOOL 43c687d51cda3a54e0e74f109fbd2f29d041609434500b79ff194f1b67336d3644746cd33d0a1a42c31ed069fb9e83dadc2e0075f9e6a42b0590e63acfd962c1 +DIST gcc-4.5.4-piepatches-v0.4.7.tar.bz2 14636 SHA256 cde859de93194d1ad568932bdd490b47b9bfc6cf82e68d5b67ad117c3079d426 SHA512 2e59910f2919817f168d99406559d9e94978020adbc39d061a03dcbcb4a38635ff3c501d04f84c9e6023812ae1d88f54c22f2f2cf6723a76da2fadb2648e11d8 WHIRLPOOL 10001812c6e6693647465b197ed4738fe52e3c53752a551d646ab9d77ade9dfdf46e4b80ecf4b647ec865168e80c4a0bf350659b3ab11251a173179244b44972 +DIST gcc-4.5.4-uclibc-patches-1.0.tar.bz2 3019 SHA256 bcfaac58ee057ca9fdbee9295100379051b3b7df8abdf33f24da6cb3c75b4d20 SHA512 b6aa0a7d029a2a00b36fe8906d76b434fcdfc7191cbc8fffbcb8b89a66eba61ba6cd0cfdba94a79929487fbbad2163083b085476498f8be77ad473d078b0095a WHIRLPOOL f3cae558649cdbce9a7dbf0d006845d88349926d1e3d7a4717f2df5c413a1da236b9e35fe0618844578408825b6130533570146c525525a0df18223b3ebf479f +DIST gcc-4.5.4.tar.bz2 66426133 SHA256 eef3f0456db8c3d992cbb51d5d32558190bc14f3bc19383dd93acc27acc6befc SHA512 78696b287d46aacd6f150920da376ea32f58ad9f0dafd2d3b7fa6dbdd8dd7afe659108d1dfaa5807617fc5248719f50b39c37ade0173ea5b9fec2091f4656115 WHIRLPOOL 1d3aa5f344171a75144118101bf475536940eeb80f73849827ee4103c52dfb6504d9b26e21fa0984c65c5e6267e02fa6e7f8ef539c44f45470790781080aadca DIST gcc-4.6.2-patches-1.0.tar.bz2 12374 SHA256 a6fd308469094095891ba003b9c3c2d4c8bf35713df987609b675f04a43e83df DIST gcc-4.6.2-piepatches-v0.4.5.tar.bz2 14156 SHA256 a18bea1bc2cad2efde5481a5777a97cf539d206dcbca33758d56d7fbdb43a554 DIST gcc-4.6.2-uclibc-patches-1.0.tar.bz2 3019 SHA256 25e902a6d2db7181394df5ad11fafaad064bf28a6ffebd889033f744613ac201 diff --git a/sys-devel/gcc/gcc-4.5.4.ebuild b/sys-devel/gcc/gcc-4.5.4.ebuild new file mode 100644 index 000000000..bc161c3c0 --- /dev/null +++ b/sys-devel/gcc/gcc-4.5.4.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=2 +PATCH_VER="1.1" +UCLIBC_VER="1.0" + +# Hardened gcc 4 stuff +PIE_VER="0.4.7" +SPECS_VER="0.2.0" +SPECS_GCC_VER="4.4.3" +# arch/libc configurations known to be stable with {PIE,SSP}-by-default +PIE_GLIBC_STABLE="x86 amd64 ppc ppc64 arm ia64" +PIE_UCLIBC_STABLE="x86 arm amd64 ppc ppc64" +SSP_STABLE="amd64 x86 ppc ppc64 arm" +# uclibc need tls and nptl support for SSP support +SSP_UCLIBC_STABLE="" +#end Hardened stuff + +inherit toolchain + +DESCRIPTION="The GNU Compiler Collection" + +LICENSE="GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2" +KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" + +RDEPEND="~sys-devel/base-gcc-${PV} + !build? ( + gcj? ( + gtk? ( + x11-libs/libXt + x11-libs/libX11 + x11-libs/libXtst + x11-proto/xproto + x11-proto/xextproto + =x11-libs/gtk+-2* + x11-libs/pango + ) + >=media-libs/libart_lgpl-2.1 + app-arch/zip + app-arch/unzip + ) + )" + +## Make sure we share all the USE flags in sys-devel/base-gcc +BASE_GCC_USE="fortran gcj gtk mudflap multilib nls nptl openmp altivec + bootstrap build doc fixed-point graphite hardened lto + multislot nocxx nopie nossp objc objc++ objc-gc test vanilla" +for base_use in ${BASE_GCC_USE}; do + RDEPEND+=" ~sys-devel/base-gcc-${PV}[${base_use}?]" +done +IUSE="${BASE_GCC_USE}" + +DEPEND="${RDEPEND} + amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) )" +## Should this be moved to base-gcc? +## I guess the cross-* thing is now utterly broken +if [[ ${CATEGORY} != cross-* ]] ; then + PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )" +fi + +## No changes +src_unpack() { + toolchain_src_unpack + + use vanilla && return 0 + + sed -i 's/use_fixproto=yes/:/' gcc/config.gcc #PR33200 + + [[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch +} + +## Remove lto conditional +pkg_setup() { + toolchain_pkg_setup +} + +## Just install libgcc stuff +src_install() { + toolchain_src_install + + # now drop what's provided by sys-devel/base-gcc-${PV}:${SLOT} + base_gcc_libs="libgfortran.so* libgcc_s.so* libobjc.so* + libobjc_gc.so* libmudflap.so* libmudflapth.so* libgomp.so* libstdc++.so*" + base_multilib_gcc_libs="32/libgfortran.so* 32/libobjc.so* 32/libobjc_gc.so* + 32/libgcc_s.so* 32/libgomp.so* 32/libmudflap.so* + 32/libmudflapth.so* 32/libstdc++.so*" + for gcc_lib in ${base_gcc_libs}; do + # -f is used because the file might not be there + rm "${D}"${LIBPATH}/${gcc_lib} -rf || die "cannot execute rm on ${gcc_lib}" + debug_dir="${D}"/usr/lib/debug + if [ -d "${debug_dir}" ]; then + rm "${debug_dir}"${LIBPATH}/${gcc_lib}.debug -rf || die "cannot execute rm on ${gcc_lib}.debug" + fi + done + if use multilib; then + for gcc_lib in ${base_multilib_gcc_libs}; do + # -f is used because the file might not be there + rm "${D}"${LIBPATH}/${gcc_lib} -rf || die "cannot execute rm on ${gcc_lib}" + debug_dir="${D}"/usr/lib/debug + if [ -d "${debug_dir}" ]; then + rm "${debug_dir}"${LIBPATH}/${gcc_lib}.debug -rf || die "cannot execute rm on ${gcc_lib}.debug" + fi + done + fi + # then .mo files provided by sys-devel/base-gcc-${PV}:${SLOT} + find "${D}"${DATAPATH}/locale -name libstdc++.mo -delete + find "${D}"${DATAPATH}/info -name libgomp.info* -delete + + # drop stuff from env.d, provided by sys-devel/base-gcc-${PV}:${SLOT} + rm "${D}"/etc/env.d -rf +}