summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2005-07-20 11:15:54 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2005-07-20 11:15:54 +0000
commit8eb466af7f44d99104f5917772e011f3c33dc01d (patch)
treee3eccfab3b0bef5e05717d9c8c80a9400d040ebb /media-video/nvidia-glx
parentAdded to ~ppc (diff)
downloadhistorical-8eb466af7f44d99104f5917772e011f3c33dc01d.tar.gz
historical-8eb466af7f44d99104f5917772e011f3c33dc01d.tar.bz2
historical-8eb466af7f44d99104f5917772e011f3c33dc01d.zip
glibc-2.3.5 with linuxthreads only does not use tls on CHOST=i586 or i686.
Package-Manager: portage-2.0.51.22-r2
Diffstat (limited to 'media-video/nvidia-glx')
-rw-r--r--media-video/nvidia-glx/ChangeLog5
-rw-r--r--media-video/nvidia-glx/Manifest10
-rw-r--r--media-video/nvidia-glx/nvidia-glx-1.0.7667.ebuild9
3 files changed, 16 insertions, 8 deletions
diff --git a/media-video/nvidia-glx/ChangeLog b/media-video/nvidia-glx/ChangeLog
index 014104bd57fb..ee0a0ca0d92d 100644
--- a/media-video/nvidia-glx/ChangeLog
+++ b/media-video/nvidia-glx/ChangeLog
@@ -1,12 +1,13 @@
# ChangeLog for media-video/nvidia-glx
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.98 2005/07/20 09:28:12 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.99 2005/07/20 11:15:54 eradicator Exp $
20 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org> -files/libGL.la,
-nvidia-glx-1.0.6111-r1.ebuild, nvidia-glx-1.0.6111-r2.ebuild,
-nvidia-glx-1.0.6629-r1.ebuild, -nvidia-glx-1.0.6629-r5.ebuild,
nvidia-glx-1.0.6629-r6.ebuild, nvidia-glx-1.0.7167-r2.ebuild,
- nvidia-glx-1.0.7174-r4.ebuild, -nvidia-glx-1.0.7664.ebuild:
+ nvidia-glx-1.0.7174-r4.ebuild, -nvidia-glx-1.0.7664.ebuild,
+ nvidia-glx-1.0.7667.ebuild:
Removing old versions. Fixing want_tls to work with 2.3.5 on CHOST=i486 and
i586.
diff --git a/media-video/nvidia-glx/Manifest b/media-video/nvidia-glx/Manifest
index 21e5fa570cbd..d10e44624886 100644
--- a/media-video/nvidia-glx/Manifest
+++ b/media-video/nvidia-glx/Manifest
@@ -1,13 +1,13 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-MD5 29b7d970e0be6958e530630099a32401 ChangeLog 20941
+MD5 d4ace836f8120da5bc64048bccb1be74 ChangeLog 20971
MD5 e06e73d71a54036f83abf35efc6322e3 metadata.xml 302
MD5 84d76e7e47009583e937b217a139924a nvidia-glx-1.0.6111-r2.ebuild 7643
MD5 6ca7c051a89c2afafcef2bf3befa6b44 nvidia-glx-1.0.7167-r2.ebuild 7863
MD5 1d833c80b4453ffd5f2c46d2c342f61a nvidia-glx-1.0.7174-r4.ebuild 8261
MD5 d146a360883f212b328c4f0f0922d310 nvidia-glx-1.0.6629-r6.ebuild 7643
-MD5 f9833d89994ce567f63b487bbf0d1a82 nvidia-glx-1.0.7667.ebuild 8023
+MD5 4f8e4d2f47ed520254fb8e887aa96c28 nvidia-glx-1.0.7667.ebuild 8208
MD5 c3afc69f917a783ebd53cf2de38065dc files/09nvidia 61
MD5 6e47667cc38d8ce4ac2f4c7dbb392abe files/libGL.la-r2 751
MD5 61c3ebdd8604c971bf969ea03040d170 files/digest-nvidia-glx-1.0.7174-r4 163
@@ -24,7 +24,7 @@ MD5 f6f00d8e915e18f456ad615b4ebd8a21 files/1.0.6629/NVIDIA_glx-1.0.6629-makefile
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
-iD8DBQFC3hliArHZZzCEUG0RAqarAJ9ZNhXTErf9GoZsr/eXu660uX2QkQCeIuui
-DtcIPltKoKwxCRRSWrfKG1k=
-=tJSP
+iD8DBQFC3jKIArHZZzCEUG0RArAJAJwJRhSfNEt0MbpYmo3c3L4ZKTkrUACfdH0S
+5bwuCLUj5o4zJw/DrRI2vDw=
+=Xf04
-----END PGP SIGNATURE-----
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.7667.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.7667.ebuild
index de82ba1f755c..859c84415c9f 100644
--- a/media-video/nvidia-glx/nvidia-glx-1.0.7667.ebuild
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.7667.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/media-video/nvidia-glx/nvidia-glx-1.0.7667.ebuild,v 1.1 2005/07/07 14:34:53 augustus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.7667.ebuild,v 1.2 2005/07/20 11:15:54 eradicator Exp $
inherit eutils multilib versionator
@@ -254,6 +254,13 @@ want_tls() {
# If we've got nptl, we've got tls
built_with_use sys-libs/glibc nptl && return 0
+ # 2.3.5 turned off tls for linuxthreads glibc on i486 and i586
+ if use x86 && has_version '>=sys-libs/glibc-2.3.5' ; then
+ case ${CHOST/-*} in
+ i486|i586) return 1 ;;
+ esac
+ fi
+
# These versions built linuxthreads version to support tls, too
has_version '>=sys-libs/glibc-2.3.4.20040619-r2' && return 0