summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2005-04-27 21:31:05 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2005-04-27 21:31:05 +0000
commit0bf2e34109b42c2de5e52bfcbbd031abad3e515c (patch)
treee2e89a4c22699cd802cd92d8dc89d0e870823162 /media-video
parentmultilib fixes closes bug #88539 (diff)
downloadhistorical-0bf2e34109b42c2de5e52bfcbbd031abad3e515c.tar.gz
historical-0bf2e34109b42c2de5e52bfcbbd031abad3e515c.tar.bz2
historical-0bf2e34109b42c2de5e52bfcbbd031abad3e515c.zip
Fix for bug #90047. We check if glibc was built with --with-tls and install the correct libnvidia-tls.so.
Package-Manager: portage-2.0.51.20-r4
Diffstat (limited to 'media-video')
-rw-r--r--media-video/nvidia-glx/ChangeLog9
-rw-r--r--media-video/nvidia-glx/Manifest12
-rw-r--r--media-video/nvidia-glx/files/digest-nvidia-glx-1.0.7174-r3 (renamed from media-video/nvidia-glx/files/digest-nvidia-glx-1.0.7174-r2)0
-rw-r--r--media-video/nvidia-glx/nvidia-glx-1.0.7174-r3.ebuild (renamed from media-video/nvidia-glx/nvidia-glx-1.0.7174-r2.ebuild)68
4 files changed, 39 insertions, 50 deletions
diff --git a/media-video/nvidia-glx/ChangeLog b/media-video/nvidia-glx/ChangeLog
index ce224ac5dfc4..a2df2aeaa856 100644
--- a/media-video/nvidia-glx/ChangeLog
+++ b/media-video/nvidia-glx/ChangeLog
@@ -1,6 +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.90 2005/04/26 20:23:50 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.91 2005/04/27 21:31:05 eradicator Exp $
+
+*nvidia-glx-1.0.7174-r3 (27 Apr 2005)
+
+ 27 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+ -nvidia-glx-1.0.7174-r2.ebuild, +nvidia-glx-1.0.7174-r3.ebuild:
+ Fix for bug #90047. We check if glibc was built with --with-tls and install
+ the correct libnvidia-tls.so.
26 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
nvidia-glx-1.0.7174-r2.ebuild:
diff --git a/media-video/nvidia-glx/Manifest b/media-video/nvidia-glx/Manifest
index c57a18d622f5..c2b8d4e33035 100644
--- a/media-video/nvidia-glx/Manifest
+++ b/media-video/nvidia-glx/Manifest
@@ -1,23 +1,23 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-MD5 8b7fb1d9305b37d25349ea58c146f62b ChangeLog 18652
+MD5 2411c63208d2ee10f8f460181491bfb2 ChangeLog 18925
MD5 e06e73d71a54036f83abf35efc6322e3 metadata.xml 302
MD5 0b5c0e9847ecde734dbf9e5b38185be2 nvidia-glx-1.0.6629-r1.ebuild 5656
MD5 602445f790dfcd667782292575f1db40 nvidia-glx-1.0.6111-r1.ebuild 5584
MD5 3892f841b65ffb03c03b838214fd7a6d nvidia-glx-1.0.6629-r5.ebuild 6624
-MD5 61529091a959f9c0cde610b80778f64c nvidia-glx-1.0.7174-r2.ebuild 8083
MD5 154f21ff3b663c19f1786d92c3ad9b47 nvidia-glx-1.0.7167-r1.ebuild 6827
MD5 5fbd1ad33dd262a21e3c792323c15f89 nvidia-glx-1.0.7174-r1.ebuild 6911
+MD5 441bd5bb64b0d4770309fa261a3ec777 nvidia-glx-1.0.7174-r3.ebuild 7597
MD5 c3afc69f917a783ebd53cf2de38065dc files/09nvidia 61
MD5 8a4687b0fc3e7cc0b36c247697d94701 files/digest-nvidia-glx-1.0.6629-r1 163
MD5 49e1d59847fbcc32cb582d9df7e1c1b3 files/libGL.la 751
MD5 ed1e098d85579c75542ef0a49ee4dd5c files/digest-nvidia-glx-1.0.6111-r1 163
MD5 8a4687b0fc3e7cc0b36c247697d94701 files/digest-nvidia-glx-1.0.6629-r5 163
MD5 6e47667cc38d8ce4ac2f4c7dbb392abe files/libGL.la-r2 751
-MD5 61c3ebdd8604c971bf969ea03040d170 files/digest-nvidia-glx-1.0.7174-r2 163
MD5 97b3ec5488fb7f7f6cdde31ee42e45af files/digest-nvidia-glx-1.0.7167-r1 163
MD5 61c3ebdd8604c971bf969ea03040d170 files/digest-nvidia-glx-1.0.7174-r1 163
+MD5 61c3ebdd8604c971bf969ea03040d170 files/digest-nvidia-glx-1.0.7174-r3 163
MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/1.0.6111/NVIDIA_glx-1.0.6111-defines.patch 437
MD5 32901fb95c4fdc6cfa6b762498240b3c files/1.0.6111/NVIDIA_glx-1.0.6111-glheader.patch 380
MD5 6f55327ce020f7ed0d433ea99dacb315 files/1.0.6111/NVIDIA_glx-1.0.6111-makefile.patch 593
@@ -27,7 +27,7 @@ MD5 f6f00d8e915e18f456ad615b4ebd8a21 files/1.0.6629/NVIDIA_glx-1.0.6629-makefile
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
-iD8DBQFCbqN1ArHZZzCEUG0RAn5/AJ9Mkf5KJqmKzzIywluezv9j3GyjsACfb4c0
-yavsDCGDV1EzswSeh/UeNuo=
-=8QTN
+iD8DBQFCcASjArHZZzCEUG0RAo+UAJ9bUlPyrAuJVsCBdXl6BwJi/Ti6sQCfSydv
+DsiCBbdjcWEPF27ZaVjVL1g=
+=iYBG
-----END PGP SIGNATURE-----
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.7174-r2 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.7174-r3
index c09b689e40ca..c09b689e40ca 100644
--- a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.7174-r2
+++ b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.7174-r3
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.7174-r2.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.7174-r3.ebuild
index 7c8c8d8bc2e4..6b8082d03e96 100644
--- a/media-video/nvidia-glx/nvidia-glx-1.0.7174-r2.ebuild
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.7174-r3.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.7174-r2.ebuild,v 1.3 2005/04/26 20:23:50 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.7174-r3.ebuild,v 1.1 2005/04/27 21:31:05 eradicator Exp $
inherit eutils multilib versionator
@@ -133,32 +133,28 @@ src_install-libs() {
dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so
dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so.1
- local TLS_LT_ROOT="/usr/${inslibdir}/opengl/nvidia/tls-lt"
- dodir ${TLS_LT_ROOT}
- exeinto ${TLS_LT_ROOT}
+ local NO_TLS_ROOT="/usr/${inslibdir}/opengl/nvidia/no-tls"
+ dodir ${NO_TLS_ROOT}
+ exeinto ${NO_TLS_ROOT}
doexe usr/${pkglibdir}/libnvidia-tls.so.${PV}
- dosym libnvidia-tls.so.${PV} ${TLS_LT_ROOT}/libnvidia-tls.so
- dosym libnvidia-tls.so.${PV} ${TLS_LT_ROOT}/libnvidia-tls.so.1
+ dosym libnvidia-tls.so.${PV} ${NO_TLS_ROOT}/libnvidia-tls.so
+ dosym libnvidia-tls.so.${PV} ${NO_TLS_ROOT}/libnvidia-tls.so.1
- local TLS_NPTL_ROOT="/usr/${inslibdir}/opengl/nvidia/tls-nptl"
- dodir ${TLS_NPTL_ROOT}
- exeinto ${TLS_NPTL_ROOT}
+ local TLS_ROOT="/usr/${inslibdir}/opengl/nvidia/tls"
+ dodir ${TLS_ROOT}
+ exeinto ${TLS_ROOT}
doexe usr/${pkglibdir}/tls/libnvidia-tls.so.${PV}
- dosym libnvidia-tls.so.${PV} ${TLS_NPTL_ROOT}/libnvidia-tls.so
- dosym libnvidia-tls.so.${PV} ${TLS_NPTL_ROOT}/libnvidia-tls.so.1
+ dosym libnvidia-tls.so.${PV} ${TLS_ROOT}/libnvidia-tls.so
+ dosym libnvidia-tls.so.${PV} ${TLS_ROOT}/libnvidia-tls.so.1
- if nptl_in_basedir ; then
- dosym ../tls-nptl/libnvidia-tls.so ${NV_ROOT}/lib
- dosym ../tls-nptl/libnvidia-tls.so.1 ${NV_ROOT}/lib
- dosym ../tls-nptl/libnvidia-tls.so.${PV} ${NV_ROOT}/lib
+ if want_tls ; then
+ dosym ../tls/libnvidia-tls.so ${NV_ROOT}/lib
+ dosym ../tls/libnvidia-tls.so.1 ${NV_ROOT}/lib
+ dosym ../tls/libnvidia-tls.so.${PV} ${NV_ROOT}/lib
else
- dosym ../tls-lt/libnvidia-tls.so ${NV_ROOT}/lib
- dosym ../tls-lt/libnvidia-tls.so.1 ${NV_ROOT}/lib
- dosym ../tls-lt/libnvidia-tls.so.${PV} ${NV_ROOT}/lib
- fi
-
- if nptl_in_tlsdir ; then
- dosym ../tls-nptl ${NV_ROOT}/lib/tls
+ dosym ../no-tls/libnvidia-tls.so ${NV_ROOT}/lib
+ dosym ../no-tls/libnvidia-tls.so.1 ${NV_ROOT}/lib
+ dosym ../no-tls/libnvidia-tls.so.${PV} ${NV_ROOT}/lib
fi
# Not sure whether installing the .la file is neccessary;
@@ -230,34 +226,20 @@ pkg_postinst() {
einfo "output of /usr/bin/nvidia-bug-report.sh included."
}
-nptl_in_basedir() {
- # For uclibc or anything non glibc, return false
- has_version sys-libs/glibc || return 1
-
- # Old versions of glibc were lt only
- has_version '<sys-libs/glibc-2.3.2' && return 1
-
- if has_version '<sys-libs/glibc-2.3.4.20040928' ; then
- built_with_use sys-libs/glibc nptl
- else
- built_with_use sys-libs/glibc nptl nptlonly
- fi
-}
-
-nptl_in_tlsdir() {
+want_tls() {
# For uclibc or anything non glibc, return false
has_version sys-libs/glibc || return 1
- # Old versions of glibc were lt only
+ # Old versions of glibc were lt/no-tls only
has_version '<sys-libs/glibc-2.3.2' && return 1
- # These all put nptl in the base libdir
- has_version '<sys-libs/glibc-2.3.4.20040928' && return 1
+ # If we've got nptl, we've got tls
+ built_with_use sys-libs/glibc nptl && return 0
- # nptlonly makes it install in the base libdir
- built_with_use sys-libs/glibc nptlonly && return 1
+ # These versions built linuxthreads version to support tls, too
+ has_version '>=sys-libs/glibc-2.3.4.20040619-r2' && return 0
- built_with_use sys-libs/glibc nptl
+ return 1
}
pkg_postrm() {