svn commit: r354822 - head/graphics/libGL
Koop Mast
kwm at FreeBSD.org
Thu May 22 10:20:04 UTC 2014
Author: kwm
Date: Thu May 22 10:20:03 2014
New Revision: 354822
URL: http://svnweb.freebsd.org/changeset/ports/354822
QAT: https://qat.redports.org/buildarchive/r354822/
Log:
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
Modified:
head/graphics/libGL/Makefile
Modified: head/graphics/libGL/Makefile
==============================================================================
--- head/graphics/libGL/Makefile Thu May 22 10:17:41 2014 (r354821)
+++ head/graphics/libGL/Makefile Thu May 22 10:20:03 2014 (r354822)
@@ -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>
More information about the svn-ports-head
mailing list