From 10b4d8665422605f1efccadc55c8d1e3b9dc207a Mon Sep 17 00:00:00 2001 From: Christian Heim Date: Sun, 28 Jan 2007 17:20:18 +0000 Subject: [PATCH] Cleaning up the hardened profile (#163991 thanks to Jakub), removing the PKGDIR and PORTDIR (re)definition. --- profiles/hardened/ppc/make.defaults | 4 +--- profiles/hardened/ppc64/make.defaults | 4 +--- profiles/hardened/x86/make.defaults | 6 +----- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/profiles/hardened/ppc/make.defaults b/profiles/hardened/ppc/make.defaults index 15b1d4f2d751..9be455ceb755 100644 --- a/profiles/hardened/ppc/make.defaults +++ b/profiles/hardened/ppc/make.defaults @@ -1,13 +1,11 @@ # Copyright 2005 Gentoo Foundation. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/ppc/make.defaults,v 1.5 2007/01/20 14:21:41 phreak Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/ppc/make.defaults,v 1.6 2007/01/28 17:20:18 phreak Exp $ ARCH="ppc" ACCEPT_KEYWORDS="${ARCH}" GRP_STAGE23_USE="${ARCH} berkdb crypt dlloader hardened nls pam pic readline ssl tcpd zlib" USE="${ARCH} dlloader ${GRP_STAGE23_USE}" -PORTDIR=/usr/portage/ -PKGDIR=${PORTDIR}/packages/${ARCH}/ # ppc CHOST="powerpc-unknown-linux-gnu" diff --git a/profiles/hardened/ppc64/make.defaults b/profiles/hardened/ppc64/make.defaults index 236747db1d35..0f4de9e291c7 100644 --- a/profiles/hardened/ppc64/make.defaults +++ b/profiles/hardened/ppc64/make.defaults @@ -1,12 +1,10 @@ # Copyright 2005 Gentoo Foundation. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/ppc64/make.defaults,v 1.6 2007/01/20 14:21:41 phreak Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/ppc64/make.defaults,v 1.7 2007/01/28 17:20:18 phreak Exp $ ARCH="ppc64" ACCEPT_KEYWORDS="${ARCH}" USE="${ARCH} berkdb crypt dlloader hardened pam pic readline ssl zlib" -PORTDIR=/usr/portage/ -PKGDIR=${PORTDIR}/packages/${ARCH}/ # ppc64 CHOST="powerpc64-unknown-linux-gnu" diff --git a/profiles/hardened/x86/make.defaults b/profiles/hardened/x86/make.defaults index 3db3f29fa09b..4ad2ef1a01c4 100644 --- a/profiles/hardened/x86/make.defaults +++ b/profiles/hardened/x86/make.defaults @@ -1,17 +1,13 @@ # Copyright 1999-2004 Gentoo Foundation. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/make.defaults,v 1.13 2007/01/20 14:21:41 phreak Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/make.defaults,v 1.14 2007/01/28 17:20:18 phreak Exp $ ARCH="x86" ACCEPT_KEYWORDS="${ARCH}" USE="${ARCH} berkdb crypt dlloader hardened ncurses nls pam pic readline ssl tcpd zlib" GRP_STAGE23_USE="${ARCH} ${USE}" -PORTDIR=/usr/portage/ -PKGDIR=${PORTDIR}/packages/${ARCH}/ # x86 CHOST="i386-pc-linux-gnu" CFLAGS="-O2 -mcpu=i386 -pipe -fforce-addr" CXXFLAGS="${CFLAGS}" - - -- 2.26.2