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 (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,132 +1,132 @@ @@ -1,132 +1,132 @@
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
15SRCS.fontconfig= fcatomic.c fccache.c fccfg.c \ 15SRCS.fontconfig= fcatomic.c fccache.c fccfg.c \
16 fccharset.c fcdbg.c fccompat.c fcdefault.c fcdir.c \ 16 fccharset.c fcdbg.c fccompat.c fcdefault.c fcdir.c \
17 fcfreetype.c fcfs.c fchash.c fcinit.c fclang.c \ 17 fcfreetype.c fcfs.c fchash.c fcinit.c fclang.c \
18 fclist.c fcmatch.c fcmatrix.c fcname.c fcobjs.c \ 18 fclist.c fcmatch.c fcmatrix.c fcname.c fcobjs.c \
19 fcpat.c fcptrlist.c \ 19 fcpat.c fcptrlist.c \
20 fcrange.c fcserialize.c fcstat.c fcstr.c \ 20 fcrange.c fcserialize.c fcstat.c fcstr.c \
21 fcweight.c fcxml.c \ 21 fcweight.c fcxml.c \
22 ftglue.c 22 ftglue.c
23 23
24.PATH: ${FREETYPE}/src/base 24.PATH: ${FREETYPE}/src/base
25SRCS.freetype= ftbase.c ftbbox.c ftbdf.c ftdebug.c \ 25SRCS.freetype= ftbase.c ftbbox.c ftbdf.c ftdebug.c \
26 ftglyph.c ftinit.c ftmm.c ftpfr.c ftstroke.c ftsynth.c \ 26 ftglyph.c ftinit.c ftmm.c ftpfr.c ftstroke.c ftsynth.c \
27 ftsystem.c fttype1.c ftwinfnt.c ftbitmap.c 27 ftsystem.c fttype1.c ftwinfnt.c ftbitmap.c
28 28
29.PATH: ${FREETYPE}/src/autofit 29.PATH: ${FREETYPE}/src/autofit
30SRCS.freetype+= autofit.c 30SRCS.freetype+= autofit.c
31 31
32.PATH: ${FREETYPE}/src/bdf 32.PATH: ${FREETYPE}/src/bdf
33SRCS.freetype+= bdf.c 33SRCS.freetype+= bdf.c
34 34
35.PATH: ${FREETYPE}/src/cff 35.PATH: ${FREETYPE}/src/cff
36SRCS.freetype+= cff.c 36SRCS.freetype+= cff.c
37 37
38.PATH: ${FREETYPE}/src/cid 38.PATH: ${FREETYPE}/src/cid
39SRCS.freetype+= type1cid.c 39SRCS.freetype+= type1cid.c
40 40
41.PATH: ${FREETYPE}/src/gzip 41.PATH: ${FREETYPE}/src/gzip
42SRCS.freetype+= ftgzip.c 42SRCS.freetype+= ftgzip.c
43 43
44#.PATH: ${FREETYPE}/src/bzip2 44#.PATH: ${FREETYPE}/src/bzip2
45#SRCS.freetype+= ftbzip2.c 45#SRCS.freetype+= ftbzip2.c
46 46
47.PATH: ${FREETYPE}/src/lzw 47.PATH: ${FREETYPE}/src/lzw
48SRCS.freetype+= ftlzw.c 48SRCS.freetype+= ftlzw.c
49 49
50.PATH: ${FREETYPE}/src/pcf 50.PATH: ${FREETYPE}/src/pcf
51SRCS.freetype+= pcf.c 51SRCS.freetype+= pcf.c
52 52
53.PATH: ${FREETYPE}/src/pfr 53.PATH: ${FREETYPE}/src/pfr
54SRCS.freetype+= pfr.c 54SRCS.freetype+= pfr.c
55 55
56.PATH: ${FREETYPE}/src/psaux 56.PATH: ${FREETYPE}/src/psaux
57SRCS.freetype+= psaux.c 57SRCS.freetype+= psaux.c
58 58
59.PATH: ${FREETYPE}/src/pshinter 59.PATH: ${FREETYPE}/src/pshinter
60SRCS.freetype+= pshinter.c 60SRCS.freetype+= pshinter.c
61 61
62.PATH: ${FREETYPE}/src/psnames 62.PATH: ${FREETYPE}/src/psnames
63SRCS.freetype+= psnames.c 63SRCS.freetype+= psnames.c
64 64
65.PATH: ${FREETYPE}/src/raster 65.PATH: ${FREETYPE}/src/raster
66SRCS.freetype+= raster.c 66SRCS.freetype+= raster.c
67 67
68.PATH: ${FREETYPE}/src/sfnt 68.PATH: ${FREETYPE}/src/sfnt
69SRCS.freetype+= sfnt.c 69SRCS.freetype+= sfnt.c
70 70
71.PATH: ${FREETYPE}/src/smooth 71.PATH: ${FREETYPE}/src/smooth
72SRCS.freetype+= smooth.c 72SRCS.freetype+= smooth.c
73 73
74.PATH: ${FREETYPE}/src/truetype 74.PATH: ${FREETYPE}/src/truetype
75SRCS.freetype+= truetype.c 75SRCS.freetype+= truetype.c
76 76
77.PATH: ${FREETYPE}/src/type1 77.PATH: ${FREETYPE}/src/type1
78SRCS.freetype+= type1.c 78SRCS.freetype+= type1.c
79 79
80.PATH: ${FREETYPE}/src/type42 80.PATH: ${FREETYPE}/src/type42
81SRCS.freetype+= type42.c 81SRCS.freetype+= type42.c
82 82
83.PATH: ${FREETYPE}/src/winfonts 83.PATH: ${FREETYPE}/src/winfonts
84SRCS.freetype+= winfnt.c 84SRCS.freetype+= winfnt.c
85 85
86.PATH: ${EXPAT}/lib 86.PATH: ${EXPAT}/lib
87SRCS.expat= xmlparse.c xmltok.c xmlrole.c 87SRCS.expat= xmlparse.c xmltok.c xmlrole.c
88 88
89SRCS= ${SRCS.fc-cache} ${SRCS.fontconfig} ${SRCS.freetype} ${SRCS.expat} 89SRCS= ${SRCS.fc-cache} ${SRCS.fontconfig} ${SRCS.freetype} ${SRCS.expat}
90 90
91# XXX FONTCONFIG_PATH was arbitrarily chosen 91# XXX FONTCONFIG_PATH was arbitrarily chosen
92# XXX ALIGNOF_VOID_P=8 not valid for 32 bit, but probably ok? 92# XXX ALIGNOF_VOID_P=8 not valid for 32 bit, but probably ok?
93HOST_CPPFLAGS= -DFONTCONFIG_PATH='"${DESTDIR}/etc/X11/fonts"' \ 93HOST_CPPFLAGS= -DFONTCONFIG_PATH='"${DESTDIR}/etc/X11/fonts"' \
94 -DFC_DEFAULT_FONTS='"${X11FONTDIR}/Type1"' \ 94 -DFC_DEFAULT_FONTS='"${X11FONTDIR}/Type1"' \
95 -DFC_TEMPLATEDIR='"${DESTDIR}${X11FONTDIR}"' \ 95 -DFC_TEMPLATEDIR='"${DESTDIR}${X11FONTDIR}"' \
96 -DFC_CACHEDIR='"${DESTDIR}/var/cache/fontconfig"' \ 96 -DFC_CACHEDIR='"${DESTDIR}/var/cache/fontconfig"' \
97 -DFC_GPERF_SIZE_T=unsigned \ 97 -DFC_GPERF_SIZE_T=unsigned \
98 -DFC_NO_MT=1 \ 98 -DFC_NO_MT=1 \
99 -DALIGNOF_VOID_P=8 \ 99 -DALIGNOF_VOID_P=8 \
100 -DHAVE_FT_BITMAP_SIZE_Y_PPEM \ 100 -DHAVE_FT_BITMAP_SIZE_Y_PPEM \
101 -DHAVE_FT_GET_BDF_PROPERTY \ 101 -DHAVE_FT_GET_BDF_PROPERTY \
102 -DHAVE_FT_GET_NEXT_CHAR \ 102 -DHAVE_FT_GET_NEXT_CHAR \
103 -DHAVE_FT_GET_PS_FONT_INFO \ 103 -DHAVE_FT_GET_PS_FONT_INFO \
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
131.include <bsd.x11.mk> 131.include <bsd.x11.mk>
132.include <bsd.hostprog.mk> 132.include <bsd.hostprog.mk>