Module Name: src
Committed By: mrg
Date: Wed Jul 10 21:53:35 UTC 2019
Modified Files:
src/share/mk: bsd.x11.mk
Log Message:
break the build if a .pc generation leaves something matching "@.*@".
this is an error in the build that doesn't trigger issues until you
try to integrate with eg, pkgsrc.
To generate a diff of this commit:
cvs rdiff -u -r1.131 -r1.132 src/share/mk/bsd.x11.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.x11.mk
diff -u src/share/mk/bsd.x11.mk:1.131 src/share/mk/bsd.x11.mk:1.132
--- src/share/mk/bsd.x11.mk:1.131 Sat Jun 1 06:57:03 2019
+++ src/share/mk/bsd.x11.mk Wed Jul 10 21:53:35 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.131 2019/06/01 06:57:03 mrg Exp $
+# $NetBSD: bsd.x11.mk,v 1.132 2019/07/10 21:53:35 mrg Exp $
.include <bsd.init.mk>
@@ -355,8 +355,14 @@ ${_pkg}.pc: ${PKGDIST.${_pkg}}/configure
s,@EXPAT_CFLAGS@,,; \
s,@FREETYPE_CFLAGS@,-I${X11ROOTDIR}/include/freetype2 -I${X11ROOTDIR}/include,;" \
-e '/^Libs:/ s%-L\([^ ]*\)%-Wl,-rpath,\1 &%g' \
- < ${.IMPSRC} > ${.TARGET}.tmp && \
- ${MV} ${.TARGET}.tmp ${.TARGET}
+ < ${.IMPSRC} > ${.TARGET}.tmp
+ if ${TOOL_GREP} '@.*@' ${.TARGET}.tmp; then \
+ echo "${.TARGET} matches @.*@, probably missing updates" 1>&2; \
+ false; \
+ else \
+ ${MV} ${.TARGET}.tmp ${.TARGET}; \
+ fi
+
CLEANFILES+= ${_PKGCONFIG_FILES} ${_PKGCONFIG_FILES:C/$/.tmp/}
.endif
