summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Tilley <lv@gentoo.org>2004-08-31 09:20:01 +0000
committerTravis Tilley <lv@gentoo.org>2004-08-31 09:20:01 +0000
commit7fcc6dce25225e1e279d6adfb8ceda5504654f5e (patch)
treecaccdb791de1e068d8492a61229715e9a7e8589e /x11-base
parentbroken makefiles; fix them later (bug #62317) (Manifest recommit) (diff)
downloadgentoo-2-7fcc6dce25225e1e279d6adfb8ceda5504654f5e.tar.gz
gentoo-2-7fcc6dce25225e1e279d6adfb8ceda5504654f5e.tar.bz2
gentoo-2-7fcc6dce25225e1e279d6adfb8ceda5504654f5e.zip
I've added an override for amd64 that will use lib64 as the lib directory even when CONF_LIBDIR isnt lib64. This should allow for bug 62110 to be fixed (locales broken for 32bit apps).
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-x11/ChangeLog7
-rw-r--r--x11-base/xorg-x11/xorg-x11-6.7.99.903.ebuild9
2 files changed, 14 insertions, 2 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index fadb9be0c4a4..f7fc7d36ec46 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-base/xorg-x11
# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.100 2004/08/30 23:36:22 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.101 2004/08/31 09:20:01 lv Exp $
+
+ 31 Aug 2004; Travis Tilley <lv@gentoo.org> xorg-x11-6.7.99.903.ebuild:
+ I've added an override for amd64 that will use lib64 as the lib directory even
+ when CONF_LIBDIR isnt lib64. This should allow for bug 62110 to be fixed
+ (locales broken for 32bit apps).
30 Aug 2004; Seemant Kulleen <seemant@gentoo.org>
xorg-x11-6.7.99.903.ebuild:
diff --git a/x11-base/xorg-x11/xorg-x11-6.7.99.903.ebuild b/x11-base/xorg-x11/xorg-x11-6.7.99.903.ebuild
index 81aacbe15b09..293083c6115f 100644
--- a/x11-base/xorg-x11/xorg-x11-6.7.99.903.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.7.99.903.ebuild
@@ -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/x11-base/xorg-x11/xorg-x11-6.7.99.903.ebuild,v 1.4 2004/08/30 23:36:22 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.99.903.ebuild,v 1.5 2004/08/31 09:20:01 lv Exp $
# Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
# voodoo3 cards.
@@ -183,6 +183,13 @@ pkg_setup() {
die "The static and dlloader USE flags are currently incompatible with the sdk USE flag."
fi
fi
+
+ # on amd64 we need /usr/X11R6/lib64/X11/locale/lib to be a symlink
+ # created by the emul lib ebuild in order for adobe acrobat, staroffice,
+ # and a few other apps to work.
+ use amd64 && get_libdir_override lib64
+ # lib32 isnt a supported configuration (yet?)
+ [ "${CONF_LIBDIR}" == "lib32" ] && get_libdir_override lib
}
host_def_setup() {