Issue #80 - de-unify and fix up gfx/graphite2

With de-unified building we have to re-apply the fix-up
for <cstdio>, and additionally the same for <cstring>
to prevent the compiler picking the wrong versions of
standard functions.

1 files changed, 4 insertions, 9 deletions

diff --git a/gfx/graphite2/src/moz.build b/gfx/graphite2/src/moz.build
index c95c2089d..4cbb1f7ed 100644
--- a/gfx/graphite2/src/moz.build
+++ b/gfx/graphite2/src/moz.build
@@ -13,16 +13,16 @@ EXPORTS.graphite2 += [
 ]
 
 if CONFIG['GNU_CC']:
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'direct_machine.cpp'
     ]
 else:
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'call_machine.cpp'
     ]
 
 # This should contain all of the _SOURCES from files.mk, except *_machine.cpp
-UNIFIED_SOURCES += [
+SOURCES += [
     'CachedFace.cpp',
     'CmapCache.cpp',
     'Code.cpp',
@@ -44,6 +44,7 @@ UNIFIED_SOURCES += [
     'Intervals.cpp',
     'json.cpp',
     'Justifier.cpp',
+    'NameTable.cpp',
     'Pass.cpp',
     'Position.cpp',
     'SegCache.cpp',
@@ -57,12 +58,6 @@ UNIFIED_SOURCES += [
     'UtfCodec.cpp',
 ]
 
-# Excluded from UNIFIED_SOURCES because <cmath> from other files breaks it,
-# see bug 1272647.
-SOURCES += [
-    'NameTable.cpp',
-]
-
 # tell graphite2 not to export symbols, we'll be linking it directly with
 # thebes
 DEFINES['GRAPHITE2_STATIC'] = True