diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2005-04-15 22:53:03 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2005-04-15 22:53:03 +0000 |
| commit | c2dd4061973b2333f37553932f6ed819710ddb62 (patch) | |
| tree | 724c98f5599b6e85adbf5595c89fb4bbe09de45c /x11-base | |
| parent | Removing versions of opengl-update which don't work with any remaining xorg-x... (diff) | |
| download | gentoo-2-c2dd4061973b2333f37553932f6ed819710ddb62.tar.gz gentoo-2-c2dd4061973b2333f37553932f6ed819710ddb62.tar.bz2 gentoo-2-c2dd4061973b2333f37553932f6ed819710ddb62.zip | |
multilib and some sparc64 cleanup.
(Portage version: 2.0.51.19)
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-x11/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild | 10 |
2 files changed, 13 insertions, 3 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog index 5ed5b5ebfdc6..353c99072eaf 100644 --- a/x11-base/xorg-x11/ChangeLog +++ b/x11-base/xorg-x11/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-base/xorg-x11 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.366 2005/04/15 21:14:05 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.367 2005/04/15 22:53:03 eradicator Exp $ + + 15 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org> + xorg-x11-6.8.2-r2.ebuild: + multilib and some sparc64 cleanup. 15 Apr 2005; Donnie Berkholz <spyderous@gentoo.org>; -files/xpm-secfix-thomas.diff, -xorg-x11-6.8.0-r3.ebuild: diff --git a/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild index d746d538b4cd..5db9589e9c48 100644 --- a/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild +++ b/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild @@ -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/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild,v 1.2 2005/04/15 19:42:58 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild,v 1.3 2005/04/15 22:53:03 eradicator Exp $ # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory # voodoo3 cards. @@ -357,7 +357,12 @@ cflag_setup() { if use hardened && ! use dlloader; then einfo "Softening gcc for sparc." ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-pie -fno-PIE" - append-flags "-fno-pie -fno-PIE" + append-flags -fno-pie -fno-PIE + fi + + if [[ ${ABI} == "sparc64" ]]; then + ALLOWED_FLAGS="${ALLOWED_FLAGS} -D__sparc_v9__ -D__linux_sparc_64__" + append-flags -D__sparc_v9__ -D__linux_sparc_64__ fi ;; # gcc-3.3.2 causes invalid insn error @@ -555,6 +560,7 @@ host_def_setup() { # Replaces 0181_all_4.3.0-amd64-nolib64.patch if [ "$(get_libdir)" == "lib64" ]; then echo "#define HaveLib64 YES" >> ${HOSTCONF} + sed -i '/^#define Freetype2LibDir/s:^.*$:#define Freetype2LibDir /usr/lib64:' ${HOSTCONF} else echo "#define HaveLib64 NO" >> ${HOSTCONF} fi |