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 | cf49f274dbf0ffcdd7d9213ae15a03c6d146df5c (patch) | |
| tree | a378a12b0a242af48a80a8dd7e41ff45532752fc /x11-base | |
| parent | Removing versions of opengl-update which don't work with any remaining xorg-x... (diff) | |
| download | historical-cf49f274dbf0ffcdd7d9213ae15a03c6d146df5c.tar.gz historical-cf49f274dbf0ffcdd7d9213ae15a03c6d146df5c.tar.bz2 historical-cf49f274dbf0ffcdd7d9213ae15a03c6d146df5c.zip | |
multilib and some sparc64 cleanup.
Package-Manager: portage-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/Manifest | 14 | ||||
| -rw-r--r-- | x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild | 10 |
3 files changed, 25 insertions, 5 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/Manifest b/x11-base/xorg-x11/Manifest index 3beb46163d1a..c95434195b95 100644 --- a/x11-base/xorg-x11/Manifest +++ b/x11-base/xorg-x11/Manifest @@ -1,8 +1,18 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 e23453ad9932e8a1b2a6a06744a56c40 ChangeLog 86449 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230 -MD5 1b1afac24f1d4c5720dad799cd26a3cb xorg-x11-6.8.2-r2.ebuild 59600 +MD5 921af95d1f99cde011f48bfe634061d7 xorg-x11-6.8.2-r2.ebuild 59863 MD5 8839b181e475194b0a5fb497be2704a3 xorg-x11-6.8.0-r5.ebuild 52271 -MD5 dbb2e60a8755a32d7b6e765b0e696398 ChangeLog 86325 MD5 10e4498a23028c1e859020d8210989c4 xorg-x11-6.8.2-r1.ebuild 59279 MD5 9f999f4ac0b474d1a8f41cb3d15602f1 files/digest-xorg-x11-6.8.2-r2 504 MD5 54f0d370fb58a9d8a13cd11f3cb4d9b4 files/digest-xorg-x11-6.8.0-r5 911 MD5 dbe3264aa4246537122c1b6f2faba70d files/digest-xorg-x11-6.8.2-r1 504 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.1 (GNU/Linux) + +iD8DBQFCYEYhArHZZzCEUG0RAq71AJ9YcnuSP0VJSI3AY1DJ40PD6m6pNwCcCxTe +IVuZzeECSP3xWhbx6WWdgG8= +=C0JX +-----END PGP SIGNATURE----- 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 |