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
commitaedff20a957958cb4825069c37b7e31ba8452893 (patch)
treecb60ce0f31e46a2bb00a9d80df755e0b96793acf /media-video
parentAdded to ~ppc (diff)
downloadgentoo-2-aedff20a957958cb4825069c37b7e31ba8452893.tar.gz
gentoo-2-aedff20a957958cb4825069c37b7e31ba8452893.tar.bz2
gentoo-2-aedff20a957958cb4825069c37b7e31ba8452893.zip
glibc-2.3.5 with linuxthreads only does not use tls on CHOST=i586 or i686.
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/nvidia-glx/ChangeLog5
-rw-r--r--media-video/nvidia-glx/nvidia-glx-1.0.7667.ebuild9
2 files changed, 11 insertions, 3 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/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