Date: Mon, 18 Jun 2012 07:10:20 GMT From: Mark Linimon <linimon@lonesome.com> To: freebsd-x11@FreeBSD.org Subject: Re: ports/167489: [patch] fix graphics/libdrm build on tier-2 Message-ID: <201206180710.q5I7AKtF064508@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/167489; it has been noted by GNATS.
From: Mark Linimon <linimon@lonesome.com>
To: bug-followup@FreeBSD.org
Cc: Mark Linimon <linimon@lonesome.com>
Subject: Re: ports/167489: [patch] fix graphics/libdrm build on tier-2
Date: Mon, 18 Jun 2012 02:01:14 -0500
updated patch
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 18 Jun 2012 06:58:54 -0000
@@ -50,9 +50,17 @@
PLIST_SUB+= OLD="" NEW="@comment "
.endif
+.include <bsd.port.pre.mk>
+
+.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 <bsd.port.mk>
+.include <bsd.port.post.mk>
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 18 Jun 2012 06:58:54 -0000
@@ -11,13 +11,13 @@
%%OLD%%include/drm/savage_drm.h
%%OLD%%include/drm/sis_drm.h
%%OLD%%include/drm/via_drm.h
-%%OLD%%include/intel_bufmgr.h
+%%OLD%%%%X86%%include/intel_bufmgr.h
%%NEW%%include/libdrm/drm.h
%%NEW%%include/libdrm/drm_fourcc.h
%%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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206180710.q5I7AKtF064508>