From owner-freebsd-ports-bugs@FreeBSD.ORG Tue May 1 15:30:12 2012 Return-Path: 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 A26E4106567A for ; Tue, 1 May 2012 15:30:12 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 7A5B58FC0A for ; Tue, 1 May 2012 15:30:12 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q41FUC5V084049 for ; Tue, 1 May 2012 15:30:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q41FUCma084047; Tue, 1 May 2012 15:30:12 GMT (envelope-from gnats) Resent-Date: Tue, 1 May 2012 15:30:12 GMT Resent-Message-Id: <201205011530.q41FUCma084047@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, Mark Linimon Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 715EC106564A for ; Tue, 1 May 2012 15:23:11 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 521738FC12 for ; Tue, 1 May 2012 15:23:11 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q41FNBW2083832 for ; Tue, 1 May 2012 15:23:11 GMT (envelope-from linimon@freefall.freebsd.org) Received: (from linimon@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q41FNBLS083831; Tue, 1 May 2012 15:23:11 GMT (envelope-from linimon) Message-Id: <201205011523.q41FNBLS083831@freefall.freebsd.org> Date: Tue, 1 May 2012 15:23:11 GMT From: Mark Linimon To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/167489: [patch] fix graphics/libdrm build on tier-2 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Mark Linimon List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 May 2012 15:30:12 -0000 >Number: 167489 >Category: ports >Synopsis: [patch] fix graphics/libdrm build on tier-2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Tue May 01 15:30:12 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Mark Linimon >Release: FreeBSD 8.2-STABLE i386 >Organization: FreeBSD >Environment: System: FreeBSD freefall.freebsd.org 8.2-STABLE FreeBSD 8.2-STABLE #5 r227907: Wed Nov 23 21:55:50 UTC 2011 simon@freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL i386 >Description: The latest sparc64-9 build gets an error while trying to install some Intel-specific files. Apparently these are not built on sparc64 (makes sense). The patch guesses that powerpc will be affected by the same change. Not yet tested. NB: results of plist generation with and without ARCH=sparc64 below. This patch does not need to be incorporated; I have just posted this as a sanity-test. The patch that needs to be applied is in Fix: . 20c20 < @comment include/libdrm/intel_bufmgr.h --- > @comment @comment include/libdrm/intel_bufmgr.h 56,58c56,58 < lib/libdrm_intel.la < lib/libdrm_intel.so < lib/libdrm_intel.so.1 --- > @comment lib/libdrm_intel.la > @comment lib/libdrm_intel.so > @comment lib/libdrm_intel.so.1 69c69 < libdata/pkgconfig/libdrm_intel.pc --- > @comment libdata/pkgconfig/libdrm_intel.pc >How-To-Repeat: See http://pointyhat.freebsd.org/errorlogs/sparc64-errorlogs/e.9.20120427045032/libdrm-2.4.17_1.log >Fix: Index: Makefile =================================================================== RCS file: /home/pcvs/ports/graphics/libdrm/Makefile,v retrieving revision 1.24 diff -u -r1.24 Makefile --- Makefile 22 Apr 2012 15:04:07 -0000 1.24 +++ Makefile 1 May 2012 15:19:13 -0000 @@ -50,9 +50,17 @@ PLIST_SUB+= OLD="" NEW="@comment " .endif +.include + +.if ${ARCH} == "amd64" || ${ARCH} == "i386" || ${ARCH} == "ia64" +PLIST_SUB+= X86="" +.else +PLIST_SUB+= X86="@comment " +.endif + pre-patch: @${REINPLACE_CMD} 's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g; \ 12661s/x86_/amd/g' \ ${WRKSRC}/configure -.include +.include Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/graphics/libdrm/pkg-plist,v retrieving revision 1.11 diff -u -r1.11 pkg-plist --- pkg-plist 21 Apr 2012 17:03:17 -0000 1.11 +++ pkg-plist 1 May 2012 15:19:13 -0000 @@ -17,7 +17,7 @@ %%NEW%%include/libdrm/drm_mode.h %%NEW%%include/libdrm/drm_sarea.h %%NEW%%include/libdrm/i915_drm.h -%%NEW%%include/libdrm/intel_bufmgr.h +%%NEW%%%%X86%%include/libdrm/intel_bufmgr.h %%NEW%%include/libdrm/intel_debug.h %%NEW%%include/libdrm/mach64_drm.h %%NEW%%include/libdrm/mga_drm.h @@ -53,9 +53,9 @@ lib/libdrm.la lib/libdrm.so lib/libdrm.so.2 -lib/libdrm_intel.la -lib/libdrm_intel.so -lib/libdrm_intel.so.1 +%%X86%%lib/libdrm_intel.la +%%X86%%lib/libdrm_intel.so +%%X86%%lib/libdrm_intel.so.1 lib/libdrm_nouveau.la lib/libdrm_nouveau.so lib/libdrm_nouveau.so.1 @@ -66,7 +66,7 @@ %%NEW%%%%KMS%%lib/libkms.so %%NEW%%%%KMS%%lib/libkms.so.1 libdata/pkgconfig/libdrm.pc -libdata/pkgconfig/libdrm_intel.pc +%%X86%%libdata/pkgconfig/libdrm_intel.pc libdata/pkgconfig/libdrm_nouveau.pc %%NEW%%libdata/pkgconfig/libdrm_radeon.pc %%NEW%%%%KMS%%libdata/pkgconfig/libkms.pc >Release-Note: >Audit-Trail: >Unformatted: