Date: Tue, 10 Jun 2008 00:31:04 +0200 (CEST) From: "barbara.xxx1975@libero.it" <barbara.xxx1975@libero.it> To: bug-followup@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org Cc: danfe@FreeBSD.org Subject: Re: ports/124407: x11/nvidia-driver build broken on 6-STABLE Message-ID: <3255845.187471213050664376.JavaMail.defaultUser@defaultHost>
next in thread | raw e-mail | index | archive | help
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) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3255845.187471213050664376.JavaMail.defaultUser>