CVS commit: src/external/mit/xorg/tools/mkfontscale
Module Name:src
Committed By: christos
Date: Tue Jul 3 21:12:10 UTC 2018
Modified Files:
src/external/mit/xorg/tools/mkfontscale: Makefile
Log Message:
Use the fonts from our installed directory not the system when we are a tool!
Martin found it.
XXX pullup-8
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 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/tools/mkfontscale/Makefile
diff -u src/external/mit/xorg/tools/mkfontscale/Makefile:1.12 src/external/mit/xorg/tools/mkfontscale/Makefile:1.13
--- src/external/mit/xorg/tools/mkfontscale/Makefile:1.12 Wed May 9 04:13:23 2018
+++ src/external/mit/xorg/tools/mkfontscale/Makefile Tue Jul 3 17:12:10 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2018/05/09 08:13:23 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2018/07/03 21:12:10 christos Exp $
.include
@@ -81,7 +81,7 @@ LDADD= -lz
HOST_CPPFLAGS= -DFONTENC_NO_LIBFONT -DXFREE86_FT2 -DFONTENC_NO_LIBFONT \
-DFT2_BUILD_LIBRARY -DDARWIN_NO_CARBON \
- -DFONT_ENCODINGS_DIRECTORY=\"${X11FONTDIR}/encodings/encodings.dir\" \
+ -DFONT_ENCODINGS_DIRECTORY=\"${DESTDIR}${X11FONTDIR}/encodings/encodings.dir\" \
-DPACKAGE_STRING=\"NetBSD\ tools\ version\"
HOST_CPPFLAGS+= -DFT_CONFIG_OPTION_DISABLE_BZIP2
CVS commit: src/external/mit/xorg/tools/mkfontscale
Module Name:src
Committed By: riastradh
Date: Sun Feb 28 22:12:27 UTC 2016
Modified Files:
src/external/mit/xorg/tools/mkfontscale: Makefile
Log Message:
Define FC_NO_MT=1 for tools mkfontscale build.
No idea what the host's atomic ops will be but we don't need them
because this tool is not multithreaded.
Fixes harmless warnings like
all ===> external/mit/xorg/tools/mkfontscale
/home/source/ab/HEAD-llvm/xsrc/external/mit/fontconfig/dist/src/fcinit.c:29:2:
warning: #warning Could not find any system to define atomic_int macros,
library may NOT be thread-safe. [-Wcpp]
#warning Could not find any system to define atomic_int macros, library may
NOT be thread-safe.
^
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 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/tools/mkfontscale/Makefile
diff -u src/external/mit/xorg/tools/mkfontscale/Makefile:1.7 src/external/mit/xorg/tools/mkfontscale/Makefile:1.8
--- src/external/mit/xorg/tools/mkfontscale/Makefile:1.7 Thu Jul 23 08:03:26 2015
+++ src/external/mit/xorg/tools/mkfontscale/Makefile Sun Feb 28 22:12:26 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2015/07/23 08:03:26 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2016/02/28 22:12:26 riastradh Exp $
NOMAN= 1
@@ -86,6 +86,11 @@ HOST_CPPFLAGS= -DFONTENC_NO_LIBFONT -DXF
-DFONT_ENCODINGS_DIRECTORY=\"${X11FONTDIR}/encodings/encodings.dir\" \
-DPACKAGE_STRING=\"NetBSD\ tools\ version\"
HOST_CPPFLAGS+= -DFT_CONFIG_OPTION_DISABLE_BZIP2
+
+# If you make mkfontscale multithreaded, remove this and fix the
+# fontconfig atomic ops.
+HOST_CPPFLAGS+= -DFC_NO_MT=1
+
HOST_CPPFLAGS+= -I${FREETYPE}/include -I${DESTDIR}${X11INCDIR} \
-I${DESTDIR}${X11INCDIR}/freetype2
CVS commit: src/external/mit/xorg/tools/mkfontscale
Module Name:src
Committed By: mrg
Date: Fri Jul 17 06:40:49 UTC 2015
Modified Files:
src/external/mit/xorg/tools/mkfontscale: Makefile
Log Message:
mkfontscale.c demands a PACKAGE_STRING now. set it to NetBSD tools version
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 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/tools/mkfontscale/Makefile
diff -u src/external/mit/xorg/tools/mkfontscale/Makefile:1.4 src/external/mit/xorg/tools/mkfontscale/Makefile:1.5
--- src/external/mit/xorg/tools/mkfontscale/Makefile:1.4 Wed Aug 10 10:34:48 2011
+++ src/external/mit/xorg/tools/mkfontscale/Makefile Fri Jul 17 06:40:49 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/08/10 10:34:48 tsutsui Exp $
+# $NetBSD: Makefile,v 1.5 2015/07/17 06:40:49 mrg Exp $
NOMAN= 1
@@ -83,7 +83,8 @@ LDADD= -lz
HOST_CPPFLAGS= -DFONTENC_NO_LIBFONT -DXFREE86_FT2 -DFONTENC_NO_LIBFONT \
-DFT2_BUILD_LIBRARY -DDARWIN_NO_CARBON \
- -DFONT_ENCODINGS_DIRECTORY=\${X11FONTDIR}/encodings/encodings.dir\
+ -DFONT_ENCODINGS_DIRECTORY=\${X11FONTDIR}/encodings/encodings.dir\ \
+ -DPACKAGE_STRING=\NetBSD\ tools\ version\
HOST_CPPFLAGS+= -DFT_CONFIG_OPTION_DISABLE_BZIP2
HOST_CPPFLAGS+= -I${FREETYPE}/include -I${DESTDIR}${X11INCDIR} \
-I${DESTDIR}${X11INCDIR}/freetype2
