Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/mit/xorg/tools/mkfontscale Define FC_NO_MT=1 for to...



details:   https://anonhg.NetBSD.org/src/rev/91d7b3a1c85e
branches:  trunk
changeset: 343853:91d7b3a1c85e
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Feb 28 22:12:26 2016 +0000

description:
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.
  ^

diffstat:

 external/mit/xorg/tools/mkfontscale/Makefile |  7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diffs (21 lines):

diff -r 4dcb336c5528 -r 91d7b3a1c85e external/mit/xorg/tools/mkfontscale/Makefile
--- a/external/mit/xorg/tools/mkfontscale/Makefile      Sun Feb 28 20:51:03 2016 +0000
+++ b/external/mit/xorg/tools/mkfontscale/Makefile      Sun Feb 28 22:12:26 2016 +0000
@@ -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 @@
                -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
 



Home | Main Index | Thread Index | Old Index