diff options
| author | riastradh <riastradh> | 2015-02-14 05:34:13 +0000 |
|---|---|---|
| committer | riastradh <riastradh> | 2015-02-14 05:34:13 +0000 |
| commit | 7d0a021f492233c82dc9c466177c9fdd70735f5e (patch) | |
| tree | 5dca1b17a9b6b98f0439c153e32efde72a2168ee /x11 | |
| parent | 2937789e77e270742ec010152a936e61a96cbf07 (diff) | |
| download | pkgsrc-7d0a021f492233c82dc9c466177c9fdd70735f5e.tar.gz | |
Fix cross-build for arm.
- Add freedreno stuff to PLIST.
- Use ${CROSS_DESTDIR} in exists(/usr/...) test.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/libdrm/Makefile | 10 | ||||
| -rw-r--r-- | x11/libdrm/PLIST | 6 |
2 files changed, 12 insertions, 4 deletions
diff --git a/x11/libdrm/Makefile b/x11/libdrm/Makefile index f8f29a555bc..b8b4058c72e 100644 --- a/x11/libdrm/Makefile +++ b/x11/libdrm/Makefile @@ -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_STAGE.atomic= pre-configure 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 @@ CONFIGURE_ARGS+= PTHREADSTUBS_CFLAGS=-I${PREFIX}/include \ 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 --git a/x11/libdrm/PLIST b/x11/libdrm/PLIST index 0f02962ec3e..0a32fb78208 100644 --- a/x11/libdrm/PLIST +++ b/x11/libdrm/PLIST @@ -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/libdrm/vmwgfx_drm.h 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 |