From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jun 9 22:42:52 2008 Return-Path: Delivered-To: freebsd-ports-bugs@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 930701065674; Mon, 9 Jun 2008 22:42:52 +0000 (UTC) (envelope-from barbara.xxx1975@libero.it) Received: from cp-out2.libero.it (cp-out2.libero.it [212.52.84.102]) by mx1.freebsd.org (Postfix) with ESMTP id 2B77D8FC0A; Mon, 9 Jun 2008 22:42:51 +0000 (UTC) (envelope-from barbara.xxx1975@libero.it) Received: from wmail17 (172.31.0.69) by cp-out2.libero.it (8.5.014) id 4832F786013F8139; Tue, 10 Jun 2008 00:31:04 +0200 Message-ID: <3255845.187471213050664376.JavaMail.defaultUser@defaultHost> Date: Tue, 10 Jun 2008 00:31:04 +0200 (CEST) From: "barbara.xxx1975@libero.it" To: bug-followup@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain;charset="UTF-8" Content-Transfer-Encoding: 7bit X-SenderIP: 79.35.226.247 Cc: danfe@FreeBSD.org Subject: Re: ports/124407: x11/nvidia-driver build broken on 6-STABLE X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "barbara.xxx1975@libero.it" List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jun 2008 22:42:52 -0000 Sorry but the output of the make command I've posted is not correct: this is what I've got trying to create a patch but I was in hurry... This is the relevant part of the correct one: # make clean ... cc -O2 -pipe -fno-strict- aliasing -march=athlon-mp -DNV_VERSION_STRING=\"173.14.05\" -D__KERNEL__ -DNVRM -UDEBUG -U_DEBUG -DNDEBUG -O -Werror -D_KERNEL -DKLD_MODULE -nostdinc -I- - I/src -I. -I@ -I@/contrib/altq -I@/../include -I/usr/include -finline- limit=8000 -fno-common -mno-align-long-strings -mpreferred-stack-boundary=2 - mno-mmx -mno-3dnow -mno-sse -mno-sse2 -ffreestanding -Wall -Wredundant-decls - Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith - Winline -Wcast-qual -fformat-extensions -std=c99 -c nvidia_ctl.c In file included from nvidia_ctl.c:14: ./nv-freebsd.h:273: warning: static declaration of 'pmap_change_attr' follows non-static declaration ./machine/pmap.h:362: warning: previous declaration of 'pmap_change_attr' was here ./nv-freebsd.h: 289: warning: static declaration of 'pmap_mapdev_attr' follows non-static declaration ./machine/pmap.h:370: warning: previous declaration of 'pmap_mapdev_attr' was here *** Error code 1 So I had a successful build after applying the following patch (I hope that the kern.osreldate is correct.): # cat /usr/ports/x11/nvidia-driver/files/patch-src::nv-freebsd.h --- src/nv-freebsd.h.orig 2008-05-19 09:30:01.000000000 +0200 +++ src/nv- freebsd.h 2008-06-09 23:17:42.000000000 +0200 @@ -271,7 +271,7 @@ #define PAT_WRITE_BACK 0x06 #endif -#if __FreeBSD_version < 700055 +#if __FreeBSD_version < 603103 || __FreeBSD_version >= 700000 && __FreeBSD_version < 700055 static inline int pmap_change_attr(vm_offset_t va, vm_size_t size, int mode) { vm_offset_t tmp; @@ -310,7 +310,7 @@ static inline void pmap_unmapdev_attr(vm_offset_t va, vm_size_t size) { -#if __FreeBSD_version < 700055 +#if __FreeBSD_version < 603103 || __FreeBSD_version >= 700000 && __FreeBSD_version < 700055 vm_offset_t tmp; if (va != 0) {