Thu Feb 24 06:34:32 2022 UTC ()
Add more -I to find expat_config.h


(martin)
diff -r1.18 -r1.19 src/external/mit/xorg/tools/fc-cache/Makefile
cvs diff -r1.18 -r1.19 src/external/mit/xorg/tools/fc-cache/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/tools/fc-cache/Makefile 2019/09/16 06:16:42 1.18
+++ src/external/mit/xorg/tools/fc-cache/Makefile 2022/02/24 06:34:32 1.19
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.18 2019/09/16 06:16:42 maya Exp $ 1# $NetBSD: Makefile,v 1.19 2022/02/24 06:34:32 martin Exp $
2 2
3.include <bsd.hostinit.mk> 3.include <bsd.hostinit.mk>
4 4
5HOSTPROG= fc-cache 5HOSTPROG= fc-cache
6 6
7FONTCONFIG= ${X11SRCDIR.fontconfig} 7FONTCONFIG= ${X11SRCDIR.fontconfig}
8FREETYPE= ${X11SRCDIR.freetype} 8FREETYPE= ${X11SRCDIR.freetype}
9EXPAT= ${NETBSDSRCDIR}/external/mit/expat/dist 9EXPAT= ${NETBSDSRCDIR}/external/mit/expat/dist
10 10
11.PATH: ${FONTCONFIG}/fc-cache 11.PATH: ${FONTCONFIG}/fc-cache
12SRCS.fc-cache= fc-cache.c 12SRCS.fc-cache= fc-cache.c
13 13
14.PATH: ${FONTCONFIG}/src 14.PATH: ${FONTCONFIG}/src
@@ -104,27 +104,27 @@ HOST_CPPFLAGS= -DFONTCONFIG_PATH='"${DES @@ -104,27 +104,27 @@ HOST_CPPFLAGS= -DFONTCONFIG_PATH='"${DES
104 -DHAVE_FT_GET_X11_FONT_FORMAT \ 104 -DHAVE_FT_GET_X11_FONT_FORMAT \
105 -DHAVE_FT_HAS_PS_GLYPH_NAMES \ 105 -DHAVE_FT_HAS_PS_GLYPH_NAMES \
106 -DHAVE_EXPAT -DXFREE86_FT2 -DHAVE_INTTYPES_H \ 106 -DHAVE_EXPAT -DXFREE86_FT2 -DHAVE_INTTYPES_H \
107 -DFT2_BUILD_LIBRARY \ 107 -DFT2_BUILD_LIBRARY \
108 -DXML_BYTE_ORDER=0 -DHAVE_MEMMOVE=1 \ 108 -DXML_BYTE_ORDER=0 -DHAVE_MEMMOVE=1 \
109 -DHAVE_STDINT_H -DHAVE_RANDOM -DDARWIN_NO_CARBON \ 109 -DHAVE_STDINT_H -DHAVE_RANDOM -DDARWIN_NO_CARBON \
110 -DHAVE_SYS_TYPES_H -DHAVE_FCNTL_H -DHAVE_SYS_STAT_H \ 110 -DHAVE_SYS_TYPES_H -DHAVE_FCNTL_H -DHAVE_SYS_STAT_H \
111 -DHAVE_MKSTEMP \ 111 -DHAVE_MKSTEMP \
112 -DHAVE_SCANDIR \ 112 -DHAVE_SCANDIR \
113 -DFLEXIBLE_ARRAY_MEMBER="/**/" 113 -DFLEXIBLE_ARRAY_MEMBER="/**/"
114HOST_CPPFLAGS+= -DFT_CONFIG_OPTION_DISABLE_BZIP2 114HOST_CPPFLAGS+= -DFT_CONFIG_OPTION_DISABLE_BZIP2
115HOST_CPPFLAGS+= -I${FONTCONFIG} -I${FREETYPE} \ 115HOST_CPPFLAGS+= -I${FONTCONFIG} -I${FREETYPE} \
116 -I${FREETYPE}/include -I${FREETYPE}/include/freetype \ 116 -I${FREETYPE}/include -I${FREETYPE}/include/freetype \
117 -I${EXPAT}/lib \ 117 -I${EXPAT}/lib -I${EXPAT}/../lib/libexpat \
118 -I${FONTCONFIG}/../include \ 118 -I${FONTCONFIG}/../include \
119 -I${DESTDIR}${X11INCDIR} -I. \ 119 -I${DESTDIR}${X11INCDIR} -I. \
120 -I${FONTCONFIG}/../include 120 -I${FONTCONFIG}/../include
121 121
122HOST_CPPFLAGS+= -DXML_POOR_ENTROPY 122HOST_CPPFLAGS+= -DXML_POOR_ENTROPY
123 123
124HOST_CPPFLAGS+= -DTOOL_FCCACHE 124HOST_CPPFLAGS+= -DTOOL_FCCACHE
125 125
126LDADD= -lz 126LDADD= -lz
127#LDADD+= -lbz2 127#LDADD+= -lbz2
128 128
129.include "../../lib/fontconfig/src/Makefile.fcarch" 129.include "../../lib/fontconfig/src/Makefile.fcarch"
130 130