[src/netbsd-9]: src/external/mit/expat/lib/libexpat Pull up following revisio...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/bd6fb89606bd
branches:  netbsd-9
changeset: 963045:bd6fb89606bd
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Sep 28 07:29:15 2019 +0000

description:
Pull up following revision(s) (requested by maya in ticket #259):

        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.

diffstat:

 external/mit/expat/lib/libexpat/Makefile |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 98cbdc05ed07 -r bd6fb89606bd external/mit/expat/lib/libexpat/Makefile
--- a/external/mit/expat/lib/libexpat/Makefile  Sat Sep 28 07:25:53 2019 +0000
+++ b/external/mit/expat/lib/libexpat/Makefile  Sat Sep 28 07:29:15 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2016/05/14 14:39:39 spz Exp $
+#      $NetBSD: Makefile,v 1.2.18.1 2019/09/28 07:29:15 martin Exp $
 
 .include <bsd.init.mk>
 
@@ -36,7 +36,7 @@
 
 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})