Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
martin 2019-09-28 07:29:15 +00:00
parent b87a0c9179
commit b6ee4dc58e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
external/mit/expat/lib/libexpat/Makefile vendored
View File

@ -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 @@ 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})