pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/libdrm Fix cross-build for arm.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6df257a3a6b2
branches:  trunk
changeset: 646733:6df257a3a6b2
user:      riastradh <riastradh%pkgsrc.org@localhost>
date:      Sat Feb 14 05:34:13 2015 +0000

description:
Fix cross-build for arm.

- Add freedreno stuff to PLIST.
- Use ${CROSS_DESTDIR} in exists(/usr/...) test.

diffstat:

 x11/libdrm/Makefile |  10 +++++++---
 x11/libdrm/PLIST    |   6 +++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diffs (58 lines):

diff -r d32eaba00a69 -r 6df257a3a6b2 x11/libdrm/Makefile
--- a/x11/libdrm/Makefile       Sat Feb 14 05:33:04 2015 +0000
+++ b/x11/libdrm/Makefile       Sat Feb 14 05:34:13 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2015/01/22 08:28:48 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2015/02/14 05:34:13 riastradh Exp $
 
 DISTNAME=              libdrm-2.4.59
 CATEGORIES=            x11 graphics
@@ -27,7 +27,7 @@
 SUBST_VARS.atomic=     ATOMIC_OPS_CHECK
 
 ATOMIC_OPS_CHECK=      0
-.if exists(/usr/include/sys/atomic.h)
+.if exists(${CROSS_DESTDIR}/usr/include/sys/atomic.h)
 ATOMIC_OPS_CHECK=      1
 .else
 .  include "../../devel/libatomic_ops/buildlink3.mk"
@@ -38,10 +38,14 @@
                        PTHREADSTUBS_LIBS=-L${PREFIX}/lib
 CONFIGURE_ARGS+=       --disable-manpages
 
-PLIST_VARS+=   intel
+PLIST_VARS+=   intel arm
 .if !empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Mx86_64)
 .include "../../sysutils/libpciaccess/buildlink3.mk"
 PLIST.intel=   yes
+.elif !empty(MACHINE_ARCH:Marm*) || \
+      !empty(MACHINE_ARCH:Mearm*) || \
+      !empty(MACHINE_ARCH:Maarch64)
+PLIST.arm=     yes
 #.else
 #CONFIGURE_ARGS+=      --disable-intel
 .endif
diff -r d32eaba00a69 -r 6df257a3a6b2 x11/libdrm/PLIST
--- a/x11/libdrm/PLIST  Sat Feb 14 05:33:04 2015 +0000
+++ b/x11/libdrm/PLIST  Sat Feb 14 05:34:13 2015 +0000
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST,v 1.12 2015/01/22 08:28:48 wiz Exp $
+@comment $NetBSD: PLIST,v 1.13 2015/02/14 05:34:13 riastradh Exp $
+${PLIST.arm}include/freedreno/freedreno_drmif.h
+${PLIST.arm}include/freedreno/freedreno_ringbuffer.h
 include/libdrm/drm.h
 include/libdrm/drm_fourcc.h
 include/libdrm/drm_mode.h
@@ -30,10 +32,12 @@
 include/xf86drm.h
 include/xf86drmMode.h
 lib/libdrm.la
+${PLIST.arm}lib/libdrm_freedreno.la
 ${PLIST.intel}lib/libdrm_intel.la
 lib/libdrm_nouveau.la
 lib/libdrm_radeon.la
 lib/pkgconfig/libdrm.pc
+${PLIST.arm}lib/pkgconfig/libdrm_freedreno.pc
 ${PLIST.intel}lib/pkgconfig/libdrm_intel.pc
 lib/pkgconfig/libdrm_nouveau.pc
 lib/pkgconfig/libdrm_radeon.pc



Home | Main Index | Thread Index | Old Index