Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/share/mk break the build if a .pc generation leaves somethin...
details: https://anonhg.NetBSD.org/src/rev/56b05929a1eb
branches: trunk
changeset: 962287:56b05929a1eb
user: mrg <mrg%NetBSD.org@localhost>
date: Wed Jul 10 21:53:35 2019 +0000
description:
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.
diffstat:
share/mk/bsd.x11.mk | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diffs (26 lines):
diff -r 5d9dcb3e59a3 -r 56b05929a1eb share/mk/bsd.x11.mk
--- a/share/mk/bsd.x11.mk Wed Jul 10 21:32:22 2019 +0000
+++ b/share/mk/bsd.x11.mk Wed Jul 10 21:53:35 2019 +0000
@@ -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 @@
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
Home |
Main Index |
Thread Index |
Old Index