| Summary: | x11-drivers/nvidia-drivers - remove built_with_use, use EAPI=2 | ||
|---|---|---|---|
| Product: | Gentoo Linux | Reporter: | Jeroen Roovers (RETIRED) <jer> |
| Component: | New packages | Assignee: | Doug Goldstein (RETIRED) <cardoe> |
| Status: | RESOLVED FIXED | ||
| Severity: | normal | CC: | alecm_88, betelgeuse, cadik60070, che, kevin.bowling, mark+gentoobugs, mlspamcb, pva, reavertm, spock |
| Priority: | High | ||
| Version: | unspecified | ||
| Hardware: | All | ||
| OS: | Linux | ||
| URL: | http://archives.gentoo.org/gentoo-dev/msg_b39952f6916500951068dcb79f27e4ba.xml | ||
| Whiteboard: | |||
| Package list: | Runtime testing required: | --- | |
| Bug Depends on: | |||
| Bug Blocks: | 261562 | ||
(In reply to comment #0) > > COMMON="<x11-base/xorg-server-1.6.99 > + elibc_glibc? ( sys-libs/glibc[nptl] ) > multilib? ( app-emulation/emul-linux-x86-xlibs ) This needs to be >=sys-libs/glibc-2.3[nptl] because we have 2.2 in tree that does not have the nptl support. Alternatively you can use || ( >=sys-libs/glibc-2.3[nptl] =sys-libs/glibc-2.2* ) All patched. Problematic for GLIBC 2.10.1 since it doesn't have nptl use flag? Well, latest stable glibc (amd64) doesn't have it either - rendering stable nvidia-drivers + stable glibc unable to be installed together. nptl USE flag seems to be removed since glibc-2.6.1 (judging from ebuilds) Reopening Gah. Seems this route will simply bloat DEPEND:
Index: nvidia-drivers-96.43.13.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.13.eb
uild,v retrieving revision 1.3
diff -u -B -r1.3 nvidia-drivers-96.43.13.ebuild
--- nvidia-drivers-96.43.13.ebuild 6 Oct 2009 16:58:13 -0000 1.3
+++ nvidia-drivers-96.43.13.ebuild 6 Oct 2009 19:06:56 -0000
@@ -27,7 +27,7 @@
EMULTILIB_PKG="true"
COMMON="<x11-base/xorg-server-1.6.99
- elibc_glibc? ( >=sys-libs/glibc-2.3[nptl] )
+ elibc_glibc? ( || ( >=sys-libs/glibc-2.3[nptl] >=sys-libs/glibc-2.6.1 =sys-lib
s/glibc-2.2* ) ) multilib? ( app-emulation/emul-linux-x86-xlibs )
kernel_FreeBSD? ( !media-video/nvidia-freebsd )
!app-emulation/emul-linux-x86-nvidia
Perpaps we should drop that dependency entirely and check some other way or not at all whether NPTL is enabled.
*** Bug 287938 has been marked as a duplicate of this bug. *** I removed the elibc_glibc? DEPEND from all the ebuilds since it breaks horribly. *** Bug 287939 has been marked as a duplicate of this bug. *** (In reply to comment #5) > Perpaps we should drop that dependency entirely and check some other way or not > at all whether NPTL is enabled. Is there any reason not to depend on >=glibc-2.6.1 (with appropriate comment)? OK, the cause seems to be fixed, now a solution ;-) This has been fixed in the 190.42-r2 version. Future nvidia-drivers for older versions will be based on this driver version. jer & spock. Please take note of the above comment if you bump nvidia-drivers. 96.43.14 and 173.14.22 are in the tree and are no longer using built_with_use Fixed... some what... As I noted above, those ebuilds have the correct depends. The other fixed ebuilds could result in issues for some people with old glibc's due to EAPI 2's incomplete support for built_with_use |
We still need to convert some of the most recent ebuilds for the older hardware slots to not use built_with_use and to use EAPI="2". I think for 96.43.13 it should go like this: Index: nvidia-drivers-96.43.13.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.13.ebuild,v retrieving revision 1.2 diff -u -B -r1.2 nvidia-drivers-96.43.13.ebuild --- nvidia-drivers-96.43.13.ebuild 29 Aug 2009 04:21:27 -0000 1.2 +++ nvidia-drivers-96.43.13.ebuild 29 Sep 2009 17:41:04 -0000 @@ -2,6 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.13.ebuild,v 1.2 2009/08/29 04:21:27 jer Exp $ +EAPI="2" + inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver X86_NV="Linux-x86" @@ -25,6 +27,7 @@ EMULTILIB_PKG="true" COMMON="<x11-base/xorg-server-1.6.99 + elibc_glibc? ( sys-libs/glibc[nptl] ) multilib? ( app-emulation/emul-linux-x86-xlibs ) kernel_FreeBSD? ( !media-video/nvidia-freebsd ) !app-emulation/emul-linux-x86-nvidia @@ -188,7 +191,9 @@ else unpack ${A} fi +} +src_prepare() { # Patches go below here, add brief description use x86-fbsd \ && cd "${NV_DOC}" \ @@ -456,9 +461,6 @@ esac fi - # If we've got nptl, we've got tls - built_with_use --missing true 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 Looking through the ebuild I get the faint impression that some of the other improvements in newer hardware slots' ebuilds may not have been backported to older hardware slots either, but that's for another time. Work should be done on (at least) these versions: nvidia-drivers-71.86.11.ebuild nvidia-drivers-96.43.13.ebuild nvidia-drivers-173.14.20.ebuild nvidia-drivers-180.60.ebuild nvidia-drivers-185.18.31.ebuild nvidia-drivers-190.36.ebuild I vote to veto removal of any ebuilds (by betelgeuse) until we sort this out ourselves. :)