CVS commit: src/external/mit/xorg/tools/fc-cache
Module Name:src
Committed By: martin
Date: Thu Jan 19 17:07:38 UTC 2023
Modified Files:
src/external/mit/xorg/tools/fc-cache: Makefile
Log Message:
Pass -DALIGNOF_VOID_P with proper size to fix the tools build
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/external/mit/xorg/tools/fc-cache/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/tools/fc-cache/Makefile
diff -u src/external/mit/xorg/tools/fc-cache/Makefile:1.20 src/external/mit/xorg/tools/fc-cache/Makefile:1.21
--- src/external/mit/xorg/tools/fc-cache/Makefile:1.20 Thu Jan 19 06:29:10 2023
+++ src/external/mit/xorg/tools/fc-cache/Makefile Thu Jan 19 17:07:38 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2023/01/19 06:29:10 mrg Exp $
+# $NetBSD: Makefile,v 1.21 2023/01/19 17:07:38 martin Exp $
.include
@@ -89,7 +89,6 @@ SRCS.expat= xmlparse.c xmltok.c xmlrole.
SRCS= ${SRCS.fc-cache} ${SRCS.fontconfig} ${SRCS.freetype} ${SRCS.expat}
# XXX FONTCONFIG_PATH was arbitrarily chosen
-# XXX ALIGNOF_VOID_P=8 not valid for 32 bit, but probably ok?
HOST_CPPFLAGS= -DFONTCONFIG_PATH='"${DESTDIR}/etc/X11/fonts"' \
-DFC_DEFAULT_FONTS='"${X11FONTDIR}/Type1"' \
-DFC_TEMPLATEDIR='"${DESTDIR}${X11FONTDIR}"' \
@@ -97,7 +96,8 @@ HOST_CPPFLAGS= -DFONTCONFIG_PATH='"${DES
-DCONFIGDIR='"${DESTDIR}/etc/fonts/conf.d"' \
-DFC_GPERF_SIZE_T=unsigned \
-DFC_NO_MT=1 \
- -DALIGNOF_VOID_P=8 \
+ -DALIGNOF_VOID_P=${PTRSIZE} \
+ -DSIZEOF_VOID_P=${PTRSIZE} \
-DHAVE_FT_BITMAP_SIZE_Y_PPEM \
-DHAVE_FT_GET_BDF_PROPERTY \
-DHAVE_FT_GET_NEXT_CHAR \
@@ -131,4 +131,11 @@ LDADD= -lz
.include "../../lib/fontconfig/src/Makefile.fcarch"
.include
+
+.if empty(X11FLAGS.SERVER:M-D_XSERVER64)
+PTRSIZE= 4
+.else
+PTRSIZE= 8
+.endif
+
.include
CVS commit: src/external/mit/xorg/tools/fc-cache
Module Name:src Committed By: martin Date: Thu Jan 19 17:07:38 UTC 2023 Modified Files: src/external/mit/xorg/tools/fc-cache: Makefile Log Message: Pass -DALIGNOF_VOID_P with proper size to fix the tools build To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/external/mit/xorg/tools/fc-cache/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/tools/fc-cache
Module Name:src
Committed By: martin
Date: Thu Feb 24 06:34:32 UTC 2022
Modified Files:
src/external/mit/xorg/tools/fc-cache: Makefile
Log Message:
Add more -I to find expat_config.h
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/external/mit/xorg/tools/fc-cache/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/tools/fc-cache/Makefile
diff -u src/external/mit/xorg/tools/fc-cache/Makefile:1.18 src/external/mit/xorg/tools/fc-cache/Makefile:1.19
--- src/external/mit/xorg/tools/fc-cache/Makefile:1.18 Mon Sep 16 06:16:42 2019
+++ src/external/mit/xorg/tools/fc-cache/Makefile Thu Feb 24 06:34:32 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2019/09/16 06:16:42 maya Exp $
+# $NetBSD: Makefile,v 1.19 2022/02/24 06:34:32 martin Exp $
.include
@@ -114,7 +114,7 @@ HOST_CPPFLAGS= -DFONTCONFIG_PATH='"${DES
HOST_CPPFLAGS+= -DFT_CONFIG_OPTION_DISABLE_BZIP2
HOST_CPPFLAGS+= -I${FONTCONFIG} -I${FREETYPE} \
-I${FREETYPE}/include -I${FREETYPE}/include/freetype \
- -I${EXPAT}/lib \
+ -I${EXPAT}/lib -I${EXPAT}/../lib/libexpat \
-I${FONTCONFIG}/../include \
-I${DESTDIR}${X11INCDIR} -I. \
-I${FONTCONFIG}/../include
CVS commit: src/external/mit/xorg/tools/fc-cache
Module Name:src Committed By: martin Date: Thu Feb 24 06:34:32 UTC 2022 Modified Files: src/external/mit/xorg/tools/fc-cache: Makefile Log Message: Add more -I to find expat_config.h To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/external/mit/xorg/tools/fc-cache/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/tools/fc-cache
Module Name:src
Committed By: maya
Date: Mon Sep 16 06:16:42 UTC 2019
Modified Files:
src/external/mit/xorg/tools/fc-cache: Makefile
Log Message:
Define XML_POOR_ENTROPY in preparation of importing a new expat.
This is the tool fc-cache built as a native binary on the host
during the build.
The host might be non-netbsd, and we don't run configure, so we can't
know what kind of random functions it supports.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/external/mit/xorg/tools/fc-cache/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/tools/fc-cache/Makefile
diff -u src/external/mit/xorg/tools/fc-cache/Makefile:1.17 src/external/mit/xorg/tools/fc-cache/Makefile:1.18
--- src/external/mit/xorg/tools/fc-cache/Makefile:1.17 Sat Jul 20 03:54:50 2019
+++ src/external/mit/xorg/tools/fc-cache/Makefile Mon Sep 16 06:16:42 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/07/20 03:54:50 mrg Exp $
+# $NetBSD: Makefile,v 1.18 2019/09/16 06:16:42 maya Exp $
.include
@@ -119,6 +119,8 @@ HOST_CPPFLAGS+= -I${FONTCONFIG} -I${FREE
-I${DESTDIR}${X11INCDIR} -I. \
-I${FONTCONFIG}/../include
+HOST_CPPFLAGS+= -DXML_POOR_ENTROPY
+
HOST_CPPFLAGS+= -DTOOL_FCCACHE
LDADD= -lz
CVS commit: src/external/mit/xorg/tools/fc-cache
Module Name:src Committed By: maya Date: Mon Sep 16 06:16:42 UTC 2019 Modified Files: src/external/mit/xorg/tools/fc-cache: Makefile Log Message: Define XML_POOR_ENTROPY in preparation of importing a new expat. This is the tool fc-cache built as a native binary on the host during the build. The host might be non-netbsd, and we don't run configure, so we can't know what kind of random functions it supports. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/external/mit/xorg/tools/fc-cache/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
