Module Name: src
Committed By: martin
Date: Sat Sep 28 07:45:25 UTC 2019
Modified Files:
src/external/mit/expat/lib/libexpat [netbsd-8]: Makefile
Log Message:
Pull up following revision(s) (requested by maya in ticket #1394):
external/mit/expat/lib/libexpat/Makefile: revision 1.3
external/mit/expat/lib/libexpat/Makefile: revision 1.4
Now that expat_config.h uses a header that is OS-specific, using the HOST_CC
breaks for some setups which lack it (netbsd<8, possibly other things).
Use the compiler targetting netbsd that uses netbsd headers to figure out
PACKAGE_VERSION to avoid this problem.
Unless we add --sysroot, the netbsd src tree headers won't be used.
Do so, so we don't rely on the build machine to have <endian.h> for
this macro check.
Using ${CPPFLAGS} rather than my own encoding of --sysroot, since it
already includes it.
Tested by agc, thanks.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.8.1 src/external/mit/expat/lib/libexpat/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/expat/lib/libexpat/Makefile
diff -u src/external/mit/expat/lib/libexpat/Makefile:1.2 src/external/mit/expat/lib/libexpat/Makefile:1.2.8.1
--- src/external/mit/expat/lib/libexpat/Makefile:1.2 Sat May 14 14:39:39 2016
+++ src/external/mit/expat/lib/libexpat/Makefile Sat Sep 28 07:45:25 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/05/14 14:39:39 spz Exp $
+# $NetBSD: Makefile,v 1.2.8.1 2019/09/28 07:45:25 martin Exp $
.include <bsd.init.mk>
@@ -36,7 +36,7 @@ dependall: all
expat.pc: expat_config.h expat.pc.in
@(V=$$( (echo '#include <expat_config.h>'; echo PACKAGE_VERSION) | \
- ${HOST_CC} -E -I${.CURDIR} - | tail -1 | tr -d '"') && \
+ ${CC} ${CPPFLAGS} -E -I${.CURDIR} - | tail -1 | tr -d '"') && \
${TOOL_SED} -e s/@VERSION@/$$V/ < ${.CURDIR}/expat.pc.in \
> ${.TARGET})
