Bug 167489 - [patch] fix graphics/libdrm build on tier-2
Summary: [patch] fix graphics/libdrm build on tier-2
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Mark Linimon
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-05-01 16:30 UTC by Mark Linimon
Modified: 2012-06-24 18:40 UTC (History)
0 users

See Also:


Attachments
file.diff (1.83 KB, patch)
2012-05-01 16:30 UTC, Mark Linimon
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Mark Linimon freebsd_committer freebsd_triage 2012-05-01 16:30:12 UTC
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
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2012-05-01 16:30:23 UTC
Responsible Changed
From-To: freebsd-ports-bugs->freebsd-x11

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 Mark Linimon 2012-06-18 08:01:14 UTC
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
Comment 3 Mark Linimon freebsd_committer freebsd_triage 2012-06-24 18:26:34 UTC
State Changed
From-To: open->closed

Committed after test on both amd64 and sparc64. 


Comment 4 Mark Linimon freebsd_committer freebsd_triage 2012-06-24 18:26:34 UTC
Responsible Changed
From-To: freebsd-x11->linimon
Comment 5 dfilter service freebsd_committer freebsd_triage 2012-06-24 18:30:15 UTC
linimon     2012-06-24 17:30:00 UTC

  FreeBSD ports repository

  Modified files:
    graphics/libdrm      Makefile pkg-plist 
  Log:
  Fix build on powerpc and sparc64.
  
  PR:                     ports/167489
  No objection from:      x11@
  
  Revision  Changes    Path
  1.25      +9 -1      ports/graphics/libdrm/Makefile
  1.12      +6 -6      ports/graphics/libdrm/pkg-plist
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"