From: Tom Gall <tgall@gentoo.org>
Date: Wed, 3 Jan 2007 05:25:07 +0000 (+0000)
Subject: work around for baselayout
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=546cf41f417d61fe14aec167522c2871bb4111a8;p=gentoo.git

work around for baselayout
---

diff --git a/profiles/default-linux/ppc/dev/ppc64/2007.0/32bit-userland/make.defaults b/profiles/default-linux/ppc/dev/ppc64/2007.0/32bit-userland/make.defaults
index 4d3f56dcef83..62ec78c6ccb0 100644
--- a/profiles/default-linux/ppc/dev/ppc64/2007.0/32bit-userland/make.defaults
+++ b/profiles/default-linux/ppc/dev/ppc64/2007.0/32bit-userland/make.defaults
@@ -18,15 +18,15 @@ USE="${STAGE1_USE} alsa apache2 apm arts berkdb bitmap-fonts cups eds emboss enc
 
 FEATURES="autoconfig sandbox sfperms -multilib-pkg"
 
-MULTILIB_ABIS="ppc"
+#MULTILIB_ABIS="ppc"
 DEFAULT_ABI="ppc"
 KERNEL_ABI="ppc64"
 
-CFLAGS_ppc="-m32"
-LDFLAGS_ppc="-m elf32ppc"
-CHOST_ppc="powerpc-unknown-linux-gnu"
-CDEFINE_ppc="!__powerpc64__"
-LIBDIR_ppc="lib"
+#CFLAGS_ppc="-m32"
+#LDFLAGS_ppc="-m elf32ppc"
+#CHOST_ppc="powerpc-unknown-linux-gnu"
+#CDEFINE_ppc="!__powerpc64__"
+#LIBDIR_ppc="lib"
 
-LDFLAGS_ppc64="-m elf64ppc"
-CHOST_ppc64="powerpc64-unknown-linux-gnu"
+#LDFLAGS_ppc64="-m elf64ppc"
+#CHOST_ppc64="powerpc64-unknown-linux-gnu"
diff --git a/profiles/default-linux/ppc/dev/ppc64/2007.0/64bit-userland/make.defaults b/profiles/default-linux/ppc/dev/ppc64/2007.0/64bit-userland/make.defaults
index 5ab9ba61ebe6..dcf39aab1cca 100644
--- a/profiles/default-linux/ppc/dev/ppc64/2007.0/64bit-userland/make.defaults
+++ b/profiles/default-linux/ppc/dev/ppc64/2007.0/64bit-userland/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/dev/ppc64/2007.0/64bit-userland/make.defaults,v 1.4 2006/12/22 21:44:00 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/dev/ppc64/2007.0/64bit-userland/make.defaults,v 1.5 2007/01/03 05:25:07 tgall Exp $
 
 ARCH="ppc64"
 ACCEPT_KEYWORDS="ppc64"
@@ -24,25 +24,25 @@ VIDEO_CARDS="mga ati dummy fbdev nv s3 vega vga"
 
 FEATURES="autoconfig sandbox sfperms -multilib-pkg"
 
-MULTILIB_ABIS="ppc64"
+#MULTILIB_ABIS="ppc64"
 DEFAULT_ABI="ppc64"
 
 CFLAGS_ppc64="-m64"
 LDFLAGS_ppc64="-m elf64ppc"
 CHOST_ppc64="powerpc64-unknown-linux-gnu"
 CDEFINE_ppc64="__powerpc64__"
-LIBDIR_ppc64="lib"
+LIBDIR_ppc64="lib64"
 
-CFLAGS_ppc="-m32"
-LDFLAGS_ppc="-m elf32ppc"
-CHOST_ppc="powerpc-unknown-linux-gnu"
-CDEFINE_ppc="!__powerpc64__"
-LIBDIR_ppc="lib32"
+#CFLAGS_ppc="-m32"
+#LDFLAGS_ppc="-m elf32ppc"
+#CHOST_ppc="powerpc-unknown-linux-gnu"
+#CDEFINE_ppc="!__powerpc64__"
+#LIBDIR_ppc="lib32"
 
 # In case someone wants to help out by setting FEATURES="multilib-strict"
-MULTILIB_STRICT_DIRS="/lib /usr/lib /usr/kde/*/lib /usr/qt/*/lib /usr/X11R6/lib"
-MULTILIB_STRICT_DENY="64-bit.*shared object"
-MULTILIB_STRICT_EXEMPT="(perl5|gcc|gcc-lib|eclipse-3)"
+#MULTILIB_STRICT_DIRS="/lib /usr/lib /usr/kde/*/lib /usr/qt/*/lib /usr/X11R6/lib"
+#MULTILIB_STRICT_DENY="64-bit.*shared object"
+#MULTILIB_STRICT_EXEMPT="(perl5|gcc|gcc-lib|eclipse-3)"
 
 # Hack to tell baselayout to use symlinks for /lib, /usr/lib, and /usr/local/lib
 # SYMLINK_LIB="yes"
diff --git a/profiles/default-linux/ppc/dev/ppc64/2007.0/multilib/make.defaults b/profiles/default-linux/ppc/dev/ppc64/2007.0/multilib/make.defaults
index 3c96a6137303..faa723373a82 100644
--- a/profiles/default-linux/ppc/dev/ppc64/2007.0/multilib/make.defaults
+++ b/profiles/default-linux/ppc/dev/ppc64/2007.0/multilib/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/dev/ppc64/2007.0/multilib/make.defaults,v 1.1 2006/12/11 15:53:58 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/dev/ppc64/2007.0/multilib/make.defaults,v 1.2 2007/01/03 05:25:07 tgall Exp $
 
 ARCH="ppc64"
 ACCEPT_KEYWORDS="ppc64"
@@ -41,4 +41,4 @@ MULTILIB_STRICT_DENY="64-bit.*shared object"
 MULTILIB_STRICT_EXEMPT="(perl5|gcc|gcc-lib|eclipse-3)"
 
 # Hack to tell baselayout to use symlinks for /lib, /usr/lib, and /usr/local/lib
-SYMLINK_LIB="yes"
+# SYMLINK_LIB="yes"