From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SKCQr-0006FQ-Lb for garchives@archives.gentoo.org; Tue, 17 Apr 2012 17:43:13 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6ACFDE0687; Tue, 17 Apr 2012 17:43:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 38238E0687 for ; Tue, 17 Apr 2012 17:43:03 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9CBFE1B4016 for ; Tue, 17 Apr 2012 17:43:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 5F252E5403 for ; Tue, 17 Apr 2012 17:43:01 +0000 (UTC) From: "Magnus Granberg" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Magnus Granberg" Message-ID: <1334684566.eb736daa55c2d2051f34e19c0fa34c12cf62b1b4.zorry@gentoo> Subject: [gentoo-commits] proj/hardened-dev:testing commit in: eclass/ X-VCS-Repository: proj/hardened-dev X-VCS-Files: eclass/toolchain.eclass X-VCS-Directories: eclass/ X-VCS-Committer: zorry X-VCS-Committer-Name: Magnus Granberg X-VCS-Revision: eb736daa55c2d2051f34e19c0fa34c12cf62b1b4 X-VCS-Branch: testing Date: Tue, 17 Apr 2012 17:43:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 3d1091bd-d6a8-46d0-8c4c-1e01008a9a96 X-Archives-Hash: 48d0e4c4701f1f0dd29c1daab1307209 commit: eb736daa55c2d2051f34e19c0fa34c12cf62b1b4 Author: Magnus Granberg gentoo org> AuthorDate: Tue Apr 17 17:42:46 2012 +0000 Commit: Magnus Granberg gentoo org> CommitDate: Tue Apr 17 17:42:46 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/hardened-dev.= git;a=3Dcommit;h=3Deb736daa some more fixes --- eclass/toolchain.eclass | 30 ++++++++++++++++++------------ 1 files changed, 18 insertions(+), 12 deletions(-) diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 9f87225..1df8004 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -9,7 +9,7 @@ HOMEPAGE=3D"http://gcc.gnu.org/" LICENSE=3D"GPL-2 LGPL-2.1" RESTRICT=3D"strip" # cross-compilers need controlled stripping =20 -inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfi= g multilib fixheadtails pax-utils +inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfi= g multilib fixheadtails pax-utils autotools =20 if [[ ${PV} =3D=3D *_pre9999* ]] ; then EGIT_REPO_URI=3D"git://gcc.gnu.org/git/gcc.git" @@ -895,17 +895,17 @@ src_prepare() { EPATCH_MULTI_MSG=3D"Applying uClibc patches ..." \ epatch "${WORKDIR}"/uclibc fi - fi - if use_if_iuse boundschecking ; then - # modify the bounds checking patch with a regression patch - epatch "${WORKDIR}/bounds-checking-gcc-${HTB_GCC_VER}-${HTB_VER}.patch= " - BRANDING_GCC_PKGVERSION=3D"${BRANDING_GCC_PKGVERSION}, HTB-${HTB_GCC_V= ER}-${HTB_VER}" - fi - if use_if_iuse hardened && ! use_if_iuse nopie && [[ -n ${PIE_VER} ]] ;= then - guess_patch_type_in_dir "${WORKDIR}"/piepatch/ - EPATCH_MULTI_MSG=3D"Applying pie patches ..." \ - epatch "${WORKDIR}"/piepatch/ - BRANDING_GCC_PKGVERSION=3D"${BRANDING_GCC_PKGVERSION}, pie-${PIE_VER}" + if use_if_iuse boundschecking ; then + # modify the bounds checking patch with a regression patch + epatch "${WORKDIR}/bounds-checking-gcc-${HTB_GCC_VER}-${HTB_VER}.patc= h" + BRANDING_GCC_PKGVERSION=3D"${BRANDING_GCC_PKGVERSION}, HTB-${HTB_GCC_= VER}-${HTB_VER}" + fi + if use_if_iuse hardened && ! use_if_iuse nopie && [[ -n ${PIE_VER} ]] = ; then + guess_patch_type_in_dir "${WORKDIR}"/piepatch/ + EPATCH_MULTI_MSG=3D"Applying pie patches ..." \ + epatch "${WORKDIR}"/piepatch/ + BRANDING_GCC_PKGVERSION=3D"${BRANDING_GCC_PKGVERSION}, pie-${PIE_VER}= " + fi fi epatch_user =20 @@ -942,6 +942,12 @@ src_prepare() { =20 # Fixup libtool to correctly generate .la files with portage cd "${S}" + eautoreconf + for subdirs in gcc ; do + cd "${S}/${subdirs}/" + eautoreconf + done + cd "${S}" elibtoolize --portage --shallow --no-uclibc =20 gnuconfig_update