Module Name: src
Committed By: mrg
Date: Wed May 9 08:13:23 UTC 2018
Modified Files:
src/external/mit/xorg/lib/freetype: Makefile
src/external/mit/xorg/tools/fc-cache: Makefile
src/external/mit/xorg/tools/mkfontscale: Makefile
Log Message:
add some missing -I paths for new freetype.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/external/mit/xorg/lib/freetype/Makefile
cvs rdiff -u -r1.14 -r1.15 src/external/mit/xorg/tools/fc-cache/Makefile
cvs rdiff -u -r1.11 -r1.12 src/external/mit/xorg/tools/mkfontscale/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/xorg/lib/freetype/Makefile
diff -u src/external/mit/xorg/lib/freetype/Makefile:1.18 src/external/mit/xorg/lib/freetype/Makefile:1.19
--- src/external/mit/xorg/lib/freetype/Makefile:1.18 Wed May 9 07:28:44 2018
+++ src/external/mit/xorg/lib/freetype/Makefile Wed May 9 08:13:23 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2018/05/09 07:28:44 maya Exp $
+# $NetBSD: Makefile,v 1.19 2018/05/09 08:13:23 mrg Exp $
.include <bsd.own.mk>
@@ -89,6 +89,7 @@ CPPFLAGS+= -DFT_CONFIG_OPTION_SYSTEM_ZLI
-DFT2_BUILD_LIBRARY \
-DFT_CONFIG_MODULES_H="<ftmodule.h>"
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2 \
+ -I${DESTDIR}${X11INCDIR}/freetype2/freetype \
-I${DESTDIR}${X11INCDIR}/freetype2/freetype/config \
-I${X11SRCDIR.${LIB}}/include
Index: src/external/mit/xorg/tools/fc-cache/Makefile
diff -u src/external/mit/xorg/tools/fc-cache/Makefile:1.14 src/external/mit/xorg/tools/fc-cache/Makefile:1.15
--- src/external/mit/xorg/tools/fc-cache/Makefile:1.14 Wed May 9 07:28:45 2018
+++ src/external/mit/xorg/tools/fc-cache/Makefile Wed May 9 08:13:23 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2018/05/09 07:28:45 maya Exp $
+# $NetBSD: Makefile,v 1.15 2018/05/09 08:13:23 mrg Exp $
.include <bsd.hostinit.mk>
@@ -111,7 +111,8 @@ HOST_CPPFLAGS= -DFONTCONFIG_PATH='"${DES
-DFLEXIBLE_ARRAY_MEMBER="/**/"
HOST_CPPFLAGS+= -DFT_CONFIG_OPTION_DISABLE_BZIP2
HOST_CPPFLAGS+= -I${FONTCONFIG} -I${FREETYPE} \
- -I${FREETYPE}/include -I${EXPAT}/lib \
+ -I${FREETYPE}/include -I${FREETYPE}/include/freetype \
+ -I${EXPAT}/lib \
-I${FONTCONFIG}/../include \
-I${DESTDIR}${X11INCDIR} -I.
Index: src/external/mit/xorg/tools/mkfontscale/Makefile
diff -u src/external/mit/xorg/tools/mkfontscale/Makefile:1.11 src/external/mit/xorg/tools/mkfontscale/Makefile:1.12
--- src/external/mit/xorg/tools/mkfontscale/Makefile:1.11 Wed May 9 07:28:45 2018
+++ src/external/mit/xorg/tools/mkfontscale/Makefile Wed May 9 08:13:23 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2018/05/09 07:28:45 maya Exp $
+# $NetBSD: Makefile,v 1.12 2018/05/09 08:13:23 mrg Exp $
.include <bsd.hostinit.mk>
@@ -89,7 +89,8 @@ HOST_CPPFLAGS+= -DFT_CONFIG_OPTION_DISAB
# fontconfig atomic ops.
HOST_CPPFLAGS+= -DFC_NO_MT=1
-HOST_CPPFLAGS+= -I${FREETYPE}/include -I${DESTDIR}${X11INCDIR} \
+HOST_CPPFLAGS+= -I${FREETYPE}/include -I${FREETYPE}/include/freetype \
+ -I${DESTDIR}${X11INCDIR} \
-I${DESTDIR}${X11INCDIR}/freetype2
.include <bsd.x11.mk>
