[src/trunk]: src/external/mit/xorg/tools/fc-cache Pass -DALIGNOF_VOID_P with ...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ce370a6ce565
branches:  trunk
changeset: 373124:ce370a6ce565
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Jan 19 17:07:38 2023 +0000

description:
Pass -DALIGNOF_VOID_P with proper size to fix the tools build

diffstat:

 external/mit/xorg/tools/fc-cache/Makefile |  13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diffs (39 lines):

diff -r acc98fa96879 -r ce370a6ce565 external/mit/xorg/tools/fc-cache/Makefile
--- a/external/mit/xorg/tools/fc-cache/Makefile Thu Jan 19 08:03:51 2023 +0000
+++ b/external/mit/xorg/tools/fc-cache/Makefile Thu Jan 19 17:07:38 2023 +0000
@@ -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 <bsd.hostinit.mk>
 
@@ -89,7 +89,6 @@
 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 @@
                -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 @@
 .include "../../lib/fontconfig/src/Makefile.fcarch"
 
 .include <bsd.x11.mk>
+
+.if empty(X11FLAGS.SERVER:M-D_XSERVER64)
+PTRSIZE=       4
+.else
+PTRSIZE=       8
+.endif
+
 .include <bsd.hostprog.mk>