diff options
| author | Koop Mast <kwm@FreeBSD.org> | 2014-05-22 10:20:03 +0000 |
|---|---|---|
| committer | Koop Mast <kwm@FreeBSD.org> | 2014-05-22 10:20:03 +0000 |
| commit | 4b54cb2fb6729b256c35f1d5ad62e3e1c6b67c84 (patch) | |
| tree | 934c3cef856d6895ee3d20e2c7aa5c6f3537b211 /graphics/libGL | |
| parent | 29a708f0171f1d4ffbf4fb4471c9252141572d75 (diff) | |
| download | ports-4b54cb2fb6729b256c35f1d5ad62e3e1c6b67c84.tar.gz ports-4b54cb2fb6729b256c35f1d5ad62e3e1c6b67c84.zip | |
N-i-c-o on #freebsd-fr reported that dri.pc doesn't exist in the stage
directory on ARM. Thus, calling rm(1) on this non-existing file fails.
Passing "-f" to rm(1) fixes the problem.
Move the same commands which are executed in both branches of the "if
(WITH_NEW_XORG)" block, move them outside of it.
Obtained from: xorg-dev repo
Notes
Notes:
svn path=/head/; revision=354822
Diffstat (limited to 'graphics/libGL')
| -rw-r--r-- | graphics/libGL/Makefile | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/graphics/libGL/Makefile b/graphics/libGL/Makefile index dd6cc33f96f5..bb99ab57157b 100644 --- a/graphics/libGL/Makefile +++ b/graphics/libGL/Makefile @@ -32,18 +32,16 @@ CONFIGURE_ARGS+=--disable-gallium-intel .endif post-install: + ${RM} -f ${STAGEDIR}${PREFIX}/libdata/pkgconfig/dri.pc + ${RM} -rf ${STAGEDIR}${PREFIX}/include/GL/internal .if defined(WITH_NEW_XORG) @${MKDIR} ${STAGEDIR}${PREFIX}/lib/.libGL @${MV} ${STAGEDIR}${PREFIX}/lib/libGL* \ ${STAGEDIR}${PREFIX}/lib/.libGL/ ${RM} ${STAGEDIR}${PREFIX}/lib/libglapi* - ${RM} -f ${STAGEDIR}${PREFIX}/libdata/pkgconfig/dri.pc - ${RM} -rf ${STAGEDIR}${PREFIX}/include/GL/internal .else ${RM} ${STAGEDIR}${PREFIX}/include/GL/glu.h ${RM} ${STAGEDIR}${PREFIX}/include/GL/glu_mangle.h - ${RM} -rf ${STAGEDIR}${PREFIX}/include/GL/internal - ${RM} ${STAGEDIR}${PREFIX}/libdata/pkgconfig/dri.pc .endif .include <bsd.port.mk> |