From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Dec 29 20:50:10 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3E70116A403 for ; Fri, 29 Dec 2006 20:50:10 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 1AD1F13C455 for ; Fri, 29 Dec 2006 20:50:10 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id kBTKo485072266 for ; Fri, 29 Dec 2006 20:50:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id kBTKo4mA072257; Fri, 29 Dec 2006 20:50:04 GMT (envelope-from gnats) Resent-Date: Fri, 29 Dec 2006 20:50:04 GMT Resent-Message-Id: <200612292050.kBTKo4mA072257@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Rostislav Krasny Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 29BE816A47E for ; Fri, 29 Dec 2006 20:45:00 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [69.147.83.33]) by mx1.freebsd.org (Postfix) with ESMTP id 0E32613C47E for ; Fri, 29 Dec 2006 20:45:00 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id kBTKixRe014926 for ; Fri, 29 Dec 2006 20:44:59 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id kBTKixk8014925; Fri, 29 Dec 2006 20:44:59 GMT (envelope-from nobody) Message-Id: <200612292044.kBTKixk8014925@www.freebsd.org> Date: Fri, 29 Dec 2006 20:44:59 GMT From: Rostislav Krasny To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.0 Cc: Subject: ports/107339: [PATCH] ports/x11/nvidia-driver built with WITH_LEGACY_GPU_SUPPORT and without Linux support is broken X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Dec 2006 20:50:10 -0000 >Number: 107339 >Category: ports >Synopsis: [PATCH] ports/x11/nvidia-driver built with WITH_LEGACY_GPU_SUPPORT and without Linux support is broken >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Fri Dec 29 20:50:04 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Rostislav Krasny >Release: 6.2-PRERELEASE >Organization: >Environment: FreeBSD saturn.lan 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #0: Wed Dec 20 23:49:32 IST 2006 root@saturn.lan:/usr/obj/usr/src/sys/MYKERNEL i386 >Description: If nvidia-driver has been configured to be build without Linux support running 'make install -DWITH_LEGACY_GPU_SUPPORT' ends with following errors: ======================================================================= [skiped] ===> lib (all) find: /compat/linux/lib: No such file or directory find: /compat/linux/usr/lib: No such file or directory find: /compat/linux/usr/X11R6/lib: No such file or directory ===> lib/libGL (all) ===> lib/libnvidia-tls (all) ===> lib/libGLcore (all) ===> lib/libXvMCNVIDIA (all) ===> lib/compat (all) ===> lib/compat/libGL (all) ===> lib/compat/libnvidia-tls (all) ===> lib/compat/libGLcore (all) ===> x11 (all) ===> x11/driver (all) ===> x11/extension (all) ===> etc (all) ===> doc (all) ===> Installing for nvidia-driver-1.0.7184 ===> Generating temporary packing list ===> Checking if x11/nvidia-driver.orig already installed ===> src (install) install -o root -g wheel -m 555 nvidia.ko /boot/modules kldxref /boot/modules ===> lib (install) find: /compat/linux/lib: No such file or directory find: /compat/linux/usr/lib: No such file or directory find: /compat/linux/usr/X11R6/lib: No such file or directory ===> lib/libGL (install) ===> lib/libnvidia-tls (install) ===> lib/libGLcore (install) ===> lib/libXvMCNVIDIA (install) ===> lib/compat (install) ===> lib/compat/libGL (install) install: /compat/linux/usr/lib: No such file or directory *** Error code 71 Stop in /usr/ports/x11/nvidia-driver.orig/work/NVIDIA-FreeBSD-x86-1.0-7184/lib/compat/libGL. *** Error code 1 Stop in /usr/ports/x11/nvidia-driver.orig/work/NVIDIA-FreeBSD-x86-1.0-7184/lib/compat. *** Error code 1 Stop in /usr/ports/x11/nvidia-driver.orig/work/NVIDIA-FreeBSD-x86-1.0-7184/lib. *** Error code 1 Stop in /usr/ports/x11/nvidia-driver.orig/work/NVIDIA-FreeBSD-x86-1.0-7184. *** Error code 1 Stop in /usr/ports/x11/nvidia-driver.orig. ======================================================================= >How-To-Repeat: cd /usr/ports/x11/nvidia-driver && make clean && make rmconfig && make install -DWITH_LEGACY_GPU_SUPPORT Don't forget to disable the Linux support in the port options screen. >Fix: diff -ru nvidia-driver.orig/Makefile nvidia-driver/Makefile --- nvidia-driver.orig/Makefile Fri Dec 22 12:13:48 2006 +++ nvidia-driver/Makefile Fri Dec 22 12:18:21 2006 @@ -82,7 +82,7 @@ PLIST_SUB+= XSERVVERSION=${XSERVVERSION} XLIBVERSION=${XLIBVERSION} \ LINUXBASE=${LINUXBASE} NVVERSION=${NVVERSION} -.if !defined(WITHOUT_LINUX) +.if defined(WITH_LINUX) # Add explicit X11 libraries dependency since USE_LINUX causes the port to # RUN_DEPEND on the Linux libraries rather than LIB_DEPEND on native ones LIB_DEPENDS+= X11.6:${X_LIBRARIES_PORT} @@ -116,7 +116,7 @@ ${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_ACPI_PM)/define \1/' \ ${WRKSRC}/src/nv-freebsd.h .endif -.if defined(WITHOUT_LINUX) +.if !defined(WITH_LINUX) ${REINPLACE_CMD} -E 's/define (NV_SUPPORT_LINUX_COMPAT)/undef \1/' \ ${WRKSRC}/src/nv-freebsd.h .endif diff -ru nvidia-driver.orig/files/6113-patch-lib::Makefile nvidia-driver/files/6113-patch-lib::Makefile --- nvidia-driver.orig/files/6113-patch-lib::Makefile Tue Jun 28 09:28:45 2005 +++ nvidia-driver/files/6113-patch-lib::Makefile Fri Dec 22 12:17:30 2006 @@ -10,13 +10,13 @@ -FIND_DIRS= /usr/lib ${X11BASE}/lib \ - /compat/linux/lib \ -+.if !defined(WITHOUT_LINUX) ++.if defined(WITH_LINUX) +SUBDIR+= compat +.endif + +FIND_DIRS= /usr/lib ${X11BASE}/lib + -+.if !defined(WITHOUT_LINUX) ++.if defined(WITH_LINUX) +FIND_DIRS+= /compat/linux/lib \ /compat/linux/usr/lib \ /compat/linux/usr/X11R6/lib >Release-Note: >Audit-Trail: >Unformatted: