From: Jeremy Huddleston Date: Fri, 7 Jan 2005 08:12:39 +0000 (+0000) Subject: Loosen MULTILIB_STRICT_DENY a bit X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f6016cbf54ffc37673b5e5d202b37fe4cd26b9cd;p=gentoo.git Loosen MULTILIB_STRICT_DENY a bit --- diff --git a/profiles/default-linux/amd64/multilib-dev/lib/make.defaults b/profiles/default-linux/amd64/multilib-dev/lib/make.defaults index 3ccd5513bfef..5158fc9d4061 100644 --- a/profiles/default-linux/amd64/multilib-dev/lib/make.defaults +++ b/profiles/default-linux/amd64/multilib-dev/lib/make.defaults @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/multilib-dev/lib/make.defaults,v 1.2 2005/01/05 08:04:56 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/multilib-dev/lib/make.defaults,v 1.3 2005/01/07 08:12:19 eradicator Exp $ # This isn't fully implemented in portage/toolchain, yet. See # http://bugs.gentoo.org/show_bug.cgi?id=75420 @@ -21,4 +21,4 @@ CFLAGS_x86="-m32" LIBDIR_x86="lib32" MULTILIB_STRICT_DIRS="/lib /usr/lib /usr/kde/*/lib /usr/qt/*/lib /usr/X11R6/lib" -MULTILIB_STRICT_DENY="64-bit" +MULTILIB_STRICT_DENY="64-bit.*shared object" diff --git a/profiles/default-linux/amd64/multilib-dev/lib64/make.defaults b/profiles/default-linux/amd64/multilib-dev/lib64/make.defaults index d9604087c776..32d5b26a223a 100644 --- a/profiles/default-linux/amd64/multilib-dev/lib64/make.defaults +++ b/profiles/default-linux/amd64/multilib-dev/lib64/make.defaults @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/multilib-dev/lib64/make.defaults,v 1.2 2005/01/05 08:04:56 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/multilib-dev/lib64/make.defaults,v 1.3 2005/01/07 08:12:19 eradicator Exp $ # This isn't fully implemented in portage/toolchain, yet. See # http://bugs.gentoo.org/show_bug.cgi?id=75420 @@ -21,5 +21,5 @@ CFLAGS_x86="-m32" LIBDIR_x86="lib" MULTILIB_STRICT_DIRS="/lib /usr/lib /usr/kde/*/lib /usr/qt/*/lib /usr/X11R6/lib" -MULTILIB_STRICT_DENY="64-bit" +MULTILIB_STRICT_DENY="64-bit.*shared object" diff --git a/profiles/default-linux/amd64/multilib-dev/packages b/profiles/default-linux/amd64/multilib-dev/packages index 5c73d128f8ee..3a66d0d25a57 100644 --- a/profiles/default-linux/amd64/multilib-dev/packages +++ b/profiles/default-linux/amd64/multilib-dev/packages @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/multilib-dev/packages,v 1.2 2005/01/04 12:26:39 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/multilib-dev/packages,v 1.3 2005/01/07 08:12:19 eradicator Exp $ # Force toolchain versions that have been tested to work and are multilib aware *>=sys-apps/portage-2.0.51-r9 @@ -15,3 +15,4 @@ >=dev-lang/tcl-8.4.6-r1 >=dev-lang/tk-8.4.6-r1 >=dev-tcltk/expect-5.42.1 +>=net-libs/courier-authlib-0.52 diff --git a/profiles/default-linux/sparc/sparc64-multilib/dev/make.defaults b/profiles/default-linux/sparc/sparc64-multilib/dev/make.defaults index ad9d32421c65..62c5767765d2 100644 --- a/profiles/default-linux/sparc/sparc64-multilib/dev/make.defaults +++ b/profiles/default-linux/sparc/sparc64-multilib/dev/make.defaults @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64-multilib/dev/make.defaults,v 1.14 2005/01/05 08:08:27 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64-multilib/dev/make.defaults,v 1.15 2005/01/07 08:12:39 eradicator Exp $ FEATURES="sandbox ccache autoconfig multilib-pkg multilib-strict" @@ -31,4 +31,4 @@ CFLAGS_sparc32="-m32" LIBDIR_sparc32="lib" MULTILIB_STRICT_DIRS="/lib /usr/lib /usr/kde/*/lib /usr/qt/*/lib /usr/X11R6/lib" -MULTILIB_STRICT_DENY="64-bit" +MULTILIB_STRICT_DENY="64-bit.*shared object" diff --git a/profiles/default-linux/sparc/sparc64-multilib/packages b/profiles/default-linux/sparc/sparc64-multilib/packages index f2c59a41d818..285ea6fb7730 100644 --- a/profiles/default-linux/sparc/sparc64-multilib/packages +++ b/profiles/default-linux/sparc/sparc64-multilib/packages @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64-multilib/packages,v 1.14 2005/01/04 12:28:14 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64-multilib/packages,v 1.15 2005/01/07 08:12:39 eradicator Exp $ # Sometimes necessary to trick programs into thinking we're really # a sparc32 system. @@ -29,3 +29,4 @@ >=dev-lang/tcl-8.4.6-r1 >=dev-lang/tk-8.4.6-r1 >=dev-tcltk/expect-5.42.1 +>=net-libs/courier-authlib-0.52