Sat Feb 14 05:34:13 2015 UTC ()
Fix cross-build for arm.

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


(riastradh)
diff -r1.51 -r1.52 pkgsrc/x11/libdrm/Makefile
diff -r1.12 -r1.13 pkgsrc/x11/libdrm/PLIST
cvs diff -r1.51 -r1.52 pkgsrc/x11/libdrm/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/libdrm/Makefile 2015/01/22 08:28:48 1.51
+++ pkgsrc/x11/libdrm/Makefile 2015/02/14 05:34:13 1.52
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.51 2015/01/22 08:28:48 wiz Exp $ 1# $NetBSD: Makefile,v 1.52 2015/02/14 05:34:13 riastradh Exp $
2 2
3DISTNAME= libdrm-2.4.59 3DISTNAME= libdrm-2.4.59
4CATEGORIES= x11 graphics 4CATEGORIES= x11 graphics
5MASTER_SITES= http://dri.freedesktop.org/libdrm/ 5MASTER_SITES= http://dri.freedesktop.org/libdrm/
6EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
7 7
8MAINTAINER= joerg@NetBSD.org 8MAINTAINER= joerg@NetBSD.org
9HOMEPAGE= http://dri.freedesktop.org/wiki/DRM 9HOMEPAGE= http://dri.freedesktop.org/wiki/DRM
10COMMENT= Userspace interface to kernel DRM services 10COMMENT= Userspace interface to kernel DRM services
11 11
12ONLY_FOR_PLATFORM= NetBSD-*-* DragonFly-*-* FreeBSD-*-* OpenBSD-*-* \ 12ONLY_FOR_PLATFORM= NetBSD-*-* DragonFly-*-* FreeBSD-*-* OpenBSD-*-* \
13 Linux-*-* SunOS-*-* 13 Linux-*-* SunOS-*-*
14 14
@@ -17,32 +17,36 @@ USE_TOOLS+= pkg-config @@ -17,32 +17,36 @@ USE_TOOLS+= pkg-config
17USE_LIBTOOL= yes 17USE_LIBTOOL= yes
18PKGCONFIG_OVERRIDE+= libdrm.pc.in 18PKGCONFIG_OVERRIDE+= libdrm.pc.in
19GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
20 20
21.include "../../mk/bsd.prefs.mk" 21.include "../../mk/bsd.prefs.mk"
22 22
23SUBST_CLASSES+= atomic 23SUBST_CLASSES+= atomic
24SUBST_FILES.atomic= xf86drm.h 24SUBST_FILES.atomic= xf86drm.h
25SUBST_MESSAGE.atomic= Configuring xf86drm.h's atomic operations. 25SUBST_MESSAGE.atomic= Configuring xf86drm.h's atomic operations.
26SUBST_STAGE.atomic= pre-configure 26SUBST_STAGE.atomic= pre-configure
27SUBST_VARS.atomic= ATOMIC_OPS_CHECK 27SUBST_VARS.atomic= ATOMIC_OPS_CHECK
28 28
29ATOMIC_OPS_CHECK= 0 29ATOMIC_OPS_CHECK= 0
30.if exists(/usr/include/sys/atomic.h) 30.if exists(${CROSS_DESTDIR}/usr/include/sys/atomic.h)
31ATOMIC_OPS_CHECK= 1 31ATOMIC_OPS_CHECK= 1
32.else 32.else
33. include "../../devel/libatomic_ops/buildlink3.mk" 33. include "../../devel/libatomic_ops/buildlink3.mk"
34CONFIGURE_ENV+= drm_cv_atomic_primitives=libatomic-ops 34CONFIGURE_ENV+= drm_cv_atomic_primitives=libatomic-ops
35.endif 35.endif
36 36
37CONFIGURE_ARGS+= PTHREADSTUBS_CFLAGS=-I${PREFIX}/include \ 37CONFIGURE_ARGS+= PTHREADSTUBS_CFLAGS=-I${PREFIX}/include \
38 PTHREADSTUBS_LIBS=-L${PREFIX}/lib 38 PTHREADSTUBS_LIBS=-L${PREFIX}/lib
39CONFIGURE_ARGS+= --disable-manpages 39CONFIGURE_ARGS+= --disable-manpages
40 40
41PLIST_VARS+= intel 41PLIST_VARS+= intel arm
42.if !empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Mx86_64) 42.if !empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Mx86_64)
43.include "../../sysutils/libpciaccess/buildlink3.mk" 43.include "../../sysutils/libpciaccess/buildlink3.mk"
44PLIST.intel= yes 44PLIST.intel= yes
 45.elif !empty(MACHINE_ARCH:Marm*) || \
 46 !empty(MACHINE_ARCH:Mearm*) || \
 47 !empty(MACHINE_ARCH:Maarch64)
 48PLIST.arm= yes
45#.else 49#.else
46#CONFIGURE_ARGS+= --disable-intel 50#CONFIGURE_ARGS+= --disable-intel
47.endif 51.endif
48.include "../../mk/bsd.pkg.mk" 52.include "../../mk/bsd.pkg.mk"
cvs diff -r1.12 -r1.13 pkgsrc/x11/libdrm/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/libdrm/PLIST 2015/01/22 08:28:48 1.12
+++ pkgsrc/x11/libdrm/PLIST 2015/02/14 05:34:13 1.13
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1@comment $NetBSD: PLIST,v 1.12 2015/01/22 08:28:48 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.13 2015/02/14 05:34:13 riastradh Exp $
 2${PLIST.arm}include/freedreno/freedreno_drmif.h
 3${PLIST.arm}include/freedreno/freedreno_ringbuffer.h
2include/libdrm/drm.h 4include/libdrm/drm.h
3include/libdrm/drm_fourcc.h 5include/libdrm/drm_fourcc.h
4include/libdrm/drm_mode.h 6include/libdrm/drm_mode.h
5include/libdrm/drm_sarea.h 7include/libdrm/drm_sarea.h
6include/libdrm/i915_drm.h 8include/libdrm/i915_drm.h
7${PLIST.intel}include/libdrm/intel_aub.h 9${PLIST.intel}include/libdrm/intel_aub.h
8${PLIST.intel}include/libdrm/intel_bufmgr.h 10${PLIST.intel}include/libdrm/intel_bufmgr.h
9${PLIST.intel}include/libdrm/intel_debug.h 11${PLIST.intel}include/libdrm/intel_debug.h
10include/libdrm/mach64_drm.h 12include/libdrm/mach64_drm.h
11include/libdrm/mga_drm.h 13include/libdrm/mga_drm.h
12include/libdrm/nouveau.h 14include/libdrm/nouveau.h
13include/libdrm/nouveau_drm.h 15include/libdrm/nouveau_drm.h
14include/libdrm/qxl_drm.h 16include/libdrm/qxl_drm.h
@@ -20,20 +22,22 @@ include/libdrm/radeon_bo_int.h @@ -20,20 +22,22 @@ include/libdrm/radeon_bo_int.h
20include/libdrm/radeon_cs.h 22include/libdrm/radeon_cs.h
21include/libdrm/radeon_cs_gem.h 23include/libdrm/radeon_cs_gem.h
22include/libdrm/radeon_cs_int.h 24include/libdrm/radeon_cs_int.h
23include/libdrm/radeon_drm.h 25include/libdrm/radeon_drm.h
24include/libdrm/radeon_surface.h 26include/libdrm/radeon_surface.h
25include/libdrm/savage_drm.h 27include/libdrm/savage_drm.h
26include/libdrm/sis_drm.h 28include/libdrm/sis_drm.h
27include/libdrm/tegra_drm.h 29include/libdrm/tegra_drm.h
28include/libdrm/via_drm.h 30include/libdrm/via_drm.h
29include/libdrm/vmwgfx_drm.h 31include/libdrm/vmwgfx_drm.h
30include/xf86drm.h 32include/xf86drm.h
31include/xf86drmMode.h 33include/xf86drmMode.h
32lib/libdrm.la 34lib/libdrm.la
 35${PLIST.arm}lib/libdrm_freedreno.la
33${PLIST.intel}lib/libdrm_intel.la 36${PLIST.intel}lib/libdrm_intel.la
34lib/libdrm_nouveau.la 37lib/libdrm_nouveau.la
35lib/libdrm_radeon.la 38lib/libdrm_radeon.la
36lib/pkgconfig/libdrm.pc 39lib/pkgconfig/libdrm.pc
 40${PLIST.arm}lib/pkgconfig/libdrm_freedreno.pc
37${PLIST.intel}lib/pkgconfig/libdrm_intel.pc 41${PLIST.intel}lib/pkgconfig/libdrm_intel.pc
38lib/pkgconfig/libdrm_nouveau.pc 42lib/pkgconfig/libdrm_nouveau.pc
39lib/pkgconfig/libdrm_radeon.pc 43lib/pkgconfig/libdrm_radeon.pc