From 03e5aca36398d970470141f7e9a40ae6f2d12f20 Mon Sep 17 00:00:00 2001 From: Travis Tilley Date: Sun, 21 Nov 2004 23:03:06 +0000 Subject: [PATCH] cleanups to work with the toolchain.eclass refactor+tidy --- sys-devel/gcc/Manifest | 8 ++++---- sys-devel/gcc/gcc-3.3.5.ebuild | 20 +++++++++---------- sys-devel/gcc/gcc-3.4.2-r2.ebuild | 9 +++------ sys-devel/gcc/gcc-3.4.3.ebuild | 33 +++++++++++++------------------ 4 files changed, 31 insertions(+), 39 deletions(-) diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest index 551a9b5c2025..13e9bb783463 100644 --- a/sys-devel/gcc/Manifest +++ b/sys-devel/gcc/Manifest @@ -2,18 +2,18 @@ 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 88e3f17c34499c5c82dfbbe04ed7a6fb gcc-3.4.3.ebuild 13586 +MD5 b51ad5b522016590a155af2ab03f4e20 gcc-3.4.2-r2.ebuild 13458 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 4bcf46d8a3f5509cf09f23017408095d gcc-2.95.3-r8.ebuild 8407 MD5 9f2b75a5738fb492bdd6a50db9b1c8a0 gcc-3.2.3-r4.ebuild 19754 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162 -MD5 17b7e1a8fab3272beea644dacdb55b3e gcc-3.3.5.ebuild 11496 -MD5 849d93a55dc7e809cf4e3e04b8444d95 gcc-3.4.1-r3.ebuild 31292 -MD5 9451c01d4755a9f08026d9377a34eb38 gcc-3.4.2-r2.ebuild 13507 MD5 287ae167b138e6c7acbdbae60ac8bf7a gcc-3.3.2-r2.ebuild 17924 MD5 25f23074a92fbb78410eac59a3ef412b ChangeLog 74075 +MD5 453632339c41cdb4c4a6949c282556e2 gcc-3.4.3.ebuild 13325 +MD5 f7ff5f615172d410206d5f5ba59611f0 gcc-3.3.5.ebuild 11554 MD5 f7e7042c2ddf66e344b30cbc66ebaf73 files/cc 24 MD5 80d122265d3062847a4a1b161abe1d26 files/cpp 24 MD5 3213bd50acdbbd71ce7dd3e40710e30e files/digest-gcc-2.95.3-r8 64 diff --git a/sys-devel/gcc/gcc-3.3.5.ebuild b/sys-devel/gcc/gcc-3.3.5.ebuild index 06a9ca4cde23..6d6a11a120de 100644 --- a/sys-devel/gcc/gcc-3.3.5.ebuild +++ b/sys-devel/gcc/gcc-3.3.5.ebuild @@ -1,8 +1,6 @@ # 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.3.5.ebuild,v 1.4 2004/11/21 16:32:47 lv Exp $ - -inherit eutils flag-o-matic libtool gnuconfig toolchain +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.5.ebuild,v 1.5 2004/11/21 23:03:06 lv Exp $ DESCRIPTION="The GNU Compiler Collection. Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking" @@ -47,14 +45,13 @@ PP_VER="3_3_2" PP_FVER="${PP_VER//_/.}-3" HTB_VER="1.00" -SRC_URI="$(get_gcc_src_uri)" - ETYPE="gcc-compiler" #PIEPATCH_EXCLUDE="upstream/02_all_gcc-3.3.3-v8.7.1-pie-rs6000.patch.bz2" HARDENED_GCC_WORKS="x86 sparc amd64 hppa" SPLIT_SPECS="${SPLIT_SPECS:="true"}" +inherit eutils flag-o-matic libtool gnuconfig toolchain gcc_do_filter_flags() { strip-flags @@ -159,13 +156,17 @@ src_install() { dodir /etc/env.d/gcc create_gcc_env_entry - if [ "${SPLIT_SPECS}" == "true" ] && [ -n "${PIE_CORE}" ] && use !boundschecking && hardened_gcc_works; then + if want_split_specs ; then if use hardened ; then create_gcc_env_entry vanilla - else - create_gcc_env_entry hardened fi - create_gcc_env_entry hardenednossp + 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 @@ -368,7 +369,6 @@ pkg_preinst() { } pkg_postinst() { - gcc_setup_static_vars if use multilib && [ "${ARCH}" = "amd64" ] then diff --git a/sys-devel/gcc/gcc-3.4.2-r2.ebuild b/sys-devel/gcc/gcc-3.4.2-r2.ebuild index fa6165f818a0..0ff281306863 100644 --- a/sys-devel/gcc/gcc-3.4.2-r2.ebuild +++ b/sys-devel/gcc/gcc-3.4.2-r2.ebuild @@ -1,8 +1,7 @@ # 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.2-r2.ebuild,v 1.20 2004/11/18 12:19:56 lv Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.2-r2.ebuild,v 1.21 2004/11/21 23:03:06 lv Exp $ -inherit eutils flag-o-matic libtool gnuconfig toolchain 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" @@ -49,8 +48,6 @@ PIE_CORE="gcc-3.4.0-piepatches-v${PIE_VER}.tar.bz2" PP_VER="3_4_1" PP_FVER="${PP_VER//_/.}-1" HTB_VER="1.00" -SRC_URI="$(get_gcc_src_uri)" -S="$(gcc_get_s_dir)" ETYPE="gcc-compiler" @@ -58,6 +55,7 @@ ETYPE="gcc-compiler" HARDENED_GCC_WORKS="x86 sparc amd64" SPLIT_SPECS="${SPLIT_SPECS:="true"}" +inherit eutils flag-o-matic libtool gnuconfig toolchain # Recently there has been a lot of stability problem in Gentoo-land. Many # things can be the cause to this, but I believe that it is due to gcc3 @@ -418,7 +416,6 @@ pkg_preinst() { } pkg_postinst() { - gcc_setup_static_vars if use multilib && [ "${ARCH}" = "amd64" ] then @@ -428,7 +425,7 @@ pkg_postinst() { export LD_LIBRARY_PATH="${LIBPATH}:${LD_LIBRARY_PATH}" fi - do_gcc_config + should_we_gcc_config && do_gcc_config # Update libtool linker scripts to reference new gcc version ... if [ "${ROOT}" = "/" ] && \ diff --git a/sys-devel/gcc/gcc-3.4.3.ebuild b/sys-devel/gcc/gcc-3.4.3.ebuild index 66d5ed0e4b30..4b2e83b76264 100644 --- a/sys-devel/gcc/gcc-3.4.3.ebuild +++ b/sys-devel/gcc/gcc-3.4.3.ebuild @@ -1,8 +1,6 @@ # 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.ebuild,v 1.11 2004/11/21 00:56:06 lv Exp $ - -inherit eutils flag-o-matic libtool gnuconfig toolchain +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.3.ebuild,v 1.12 2004/11/21 23:03:06 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" @@ -42,25 +40,27 @@ DEPEND="${RDEPEND} 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="20041025" PATCH_VER="1.0" PIE_VER="8.7.6.6" PIE_CORE="gcc-3.4.0-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" -SRC_URI="$(get_gcc_src_uri)" - ETYPE="gcc-compiler" #PIEPATCH_EXCLUDE="upstream/04_all_gcc-3.4.0-v8.7.6.1-pie-arm-uclibc.patch.bz2" HARDENED_GCC_WORKS="x86 sparc amd64" +#HARDENED_PIE_WORKS="mips ppc" +#HARDENED_SSP_WORKS="" SPLIT_SPECS="${SPLIT_SPECS:="true"}" +inherit eutils flag-o-matic libtool gnuconfig toolchain gcc_do_filter_flags() { strip-flags @@ -196,25 +196,21 @@ src_install() { [ -r ${D}${BINPATH}/gcc ] || die "gcc not found in ${D}" fi - # Because GCC 3.4 installs into the gcc directory and not the gcc-lib - # directory, we will have to rename it in order to keep compatibility - # with our current libtool check and gcc-config (which would be a pain - # to fix compared to this simple mv and symlink). - mv ${D}/${PREFIX}/lib/gcc ${D}/${PREFIX}/lib/gcc-lib - ln -s gcc-lib ${D}/${PREFIX}/lib/gcc - #LIBPATH=${LIBPATH/lib\/gcc/lib\/gcc-lib} - dodir /lib /usr/bin dodir /etc/env.d/gcc create_gcc_env_entry - if [ "${SPLIT_SPECS}" == "true" ] && [ -n "${PIE_CORE}" ] && use !boundschecking && hardened_gcc_works; then + if want_split_specs ; then if use hardened ; then create_gcc_env_entry vanilla - else - create_gcc_env_entry hardened fi - create_gcc_env_entry hardenednossp + 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 @@ -421,7 +417,6 @@ pkg_preinst() { } pkg_postinst() { - gcc_setup_static_vars if use multilib && [ "${ARCH}" = "amd64" ] then -- 2.26.2