From owner-freebsd-current@FreeBSD.ORG Mon May 6 12:14:15 2013 Return-Path: Delivered-To: freebsd-current@FreeBSD.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id A028C3FA; Mon, 6 May 2013 12:14:15 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) by mx1.freebsd.org (Postfix) with ESMTP id 635E4FDC; Mon, 6 May 2013 12:14:15 +0000 (UTC) Received: from spaceball.andric.com (spaceball.andric.com [IPv6:2001:7b8:3a7:0:204:4bff:fe01:de8a]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 247325C5B; Mon, 6 May 2013 14:14:07 +0200 (CEST) Message-ID: <51879E8C.9080509@FreeBSD.org> Date: Mon, 06 May 2013 14:14:04 +0200 From: Dimitry Andric Organization: The FreeBSD Project User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:21.0) Gecko/20100101 Thunderbird/21.0 MIME-Version: 1.0 To: sig6247 Subject: Re: x11/nvidia-driver-173 build failed on CURRENT References: In-Reply-To: Content-Type: multipart/mixed; boundary="------------090301090401040605080307" Cc: freebsd-current@FreeBSD.org, freebsd-ports@FreeBSD.org X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 May 2013 12:14:15 -0000 This is a multi-part message in MIME format. --------------090301090401040605080307 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit [redirecting to ports@, where this belongs] On 2013-05-06 08:19, sig6247 wrote: ... > cc -O2 -pipe -fno-strict-aliasing -DNV_VERSION_STRING=\"173.14.35\" -D__KERNEL__ -DNVRM -UDEBUG -U_DEBUG -DNDEBUG -O -Werror -D_KERNEL -DKLD_MODULE -nostdinc -I/wrkdirs/usr/ports/x11/nvidia-driver-173/work/NVIDIA-FreeBSD-x86-173.14.35/src -I. -I@ -I@/contrib/altq -fno-common -mno-aes -mno-avx -mno-mmx -mno-sse -msoft-float -ffreestanding -fstack-protector -std=iso9899:1999 -Qunused-arguments -fstack-protector -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -Wundef -Wno-pointer-sign -fformat-extensions -Wmissing-include-dirs -fdiagnostics-show-option -Wno-error-tautological-compare -Wno-error-empty-body -Wno-error-parentheses-equality -c nvidia_os.c > nvidia_os.c:28:23: error: function declared with regparm(0) attribute was previously declared without the regparm attribute > RM_STATUS NV_API_CALL os_alloc_contig_pages( > ^ > /wrkdirs/usr/ports/x11/nvidia-driver-173/work/NVIDIA-FreeBSD-x86-173.14.35/src/nv-freebsd.h:145:11: note: previous declaration is here > RM_STATUS os_alloc_contig_pages(void **, U032); > ^ Please try the attached patch. I am not sure if there are more driver versions that include these inconsisent prototypes, but if anybody is aware of them, we can adjust the ${NVVERSION} check a little. -Dimitry --------------090301090401040605080307 Content-Type: text/x-diff; name="x11__nvidia-driver-1.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="x11__nvidia-driver-1.diff" Index: x11/nvidia-driver/Makefile =================================================================== --- x11/nvidia-driver/Makefile (revision 317139) +++ x11/nvidia-driver/Makefile (working copy) @@ -70,6 +70,10 @@ EXTRA_PATCHES+= ${FILESDIR}/security-patch-CVE-2012-4225 .endif +.if ${NVVERSION} == 1731435 +EXTRA_PATCHES+= ${FILESDIR}/build-patch-nv_api_call +.endif + OPTIONS_DEFINE= FREEBSD_AGP ACPI_PM LINUX DOCS OPTIONS_DEFAULT= LINUX Index: x11/nvidia-driver/files/build-patch-nv_api_call =================================================================== --- x11/nvidia-driver/files/build-patch-nv_api_call (revision 0) +++ x11/nvidia-driver/files/build-patch-nv_api_call (working copy) @@ -0,0 +1,13 @@ +--- src/nv-freebsd.h.orig 2013-05-06 13:13:49.000000000 +0200 ++++ src/nv-freebsd.h 2013-05-06 13:16:38.000000000 +0200 +@@ -142,8 +142,8 @@ + + MALLOC_DECLARE(M_NVIDIA); + +-RM_STATUS os_alloc_contig_pages(void **, U032); +-void os_free_contig_pages(void *, U032); ++RM_STATUS NV_API_CALL os_alloc_contig_pages(void **, U032); ++void NV_API_CALL os_free_contig_pages(void *, U032); + + /* + * Enable/Disable support for FreeBSD's AGP GART driver. Please note that --------------090301090401040605080307--