BLD: Fix setting FreeType build type in extension

QuLogic · QuLogic · commit 239ed51d7ac7 · 2023-10-16T20:04:47.000-04:00
Previously, this used a macro defined on the command line to a literal,
which was "stringified" with macro magic. But if the command-line
definition isn't there, then you just get a stringified version of the
macro name.

Instead, don't do any stringification, so that it fails on error. Then
pass a string as the defnition.
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -1315,13 +1315,15 @@ def _init_tests():
     if (ft2font.__freetype_version__ != LOCAL_FREETYPE_VERSION or
             ft2font.__freetype_build_type__ != 'local'):
         _log.warning(
-            f"Matplotlib is not built with the correct FreeType version to "
-            f"run tests.  Rebuild without setting system-freetype=true in "
-            f"Meson setup options.  Expect many image comparison failures below.  "
-            f"Expected freetype version {LOCAL_FREETYPE_VERSION}.  "
-            f"Found freetype version {ft2font.__freetype_version__}.  "
-            "Freetype build type is {}local".format(
-                "" if ft2font.__freetype_build_type__ == 'local' else "not "))
+            "Matplotlib is not built with the correct FreeType version to run tests.  "
+            "Rebuild without setting system-freetype=true in Meson setup options.  "
+            "Expect many image comparison failures below.  "
+            "Expected freetype version %s.  "
+            "Found freetype version %s.  "
+            "Freetype build type is %slocal.",
+            LOCAL_FREETYPE_VERSION,
+            ft2font.__freetype_version__,
+            "" if ft2font.__freetype_build_type__ == 'local' else "not ")
 
 
 def _replacer(data, value):
diff --git a/src/ft2font_wrapper.cpp b/src/ft2font_wrapper.cpp
@@ -10,9 +10,6 @@
 #include <set>
 #include <algorithm>
 
-#define STRINGIFY(s) XSTRINGIFY(s)
-#define XSTRINGIFY(s) #s
-
 static PyObject *convert_xys_to_array(std::vector<double> &xys)
 {
     npy_intp dims[] = {(npy_intp)xys.size() / 2, 2 };
@@ -1532,7 +1529,7 @@ PyMODINIT_FUNC PyInit_ft2font(void)
         // Glyph is not constructible from Python, thus not added to the module.
         PyType_Ready(PyGlyph_init_type()) ||
         PyModule_AddStringConstant(m, "__freetype_version__", version_string) ||
-        PyModule_AddStringConstant(m, "__freetype_build_type__", STRINGIFY(FREETYPE_BUILD_TYPE)) ||
+        PyModule_AddStringConstant(m, "__freetype_build_type__", FREETYPE_BUILD_TYPE) ||
         PyModule_AddIntConstant(m, "SCALABLE", FT_FACE_FLAG_SCALABLE) ||
         PyModule_AddIntConstant(m, "FIXED_SIZES", FT_FACE_FLAG_FIXED_SIZES) ||
         PyModule_AddIntConstant(m, "FIXED_WIDTH", FT_FACE_FLAG_FIXED_WIDTH) ||
diff --git a/src/meson.build b/src/meson.build
@@ -96,6 +96,11 @@ extension_data = {
     'dependencies': [
       freetype_dep, numpy_dep, agg_dep.partial_dependency(includes: true),
     ],
+    'cpp_args': [
+      '-DFREETYPE_BUILD_TYPE="@0@"'.format(
+        freetype_dep.type_name() == 'internal' ? 'local' : 'system',
+      ),
+    ],
   },
   '_image': {
     'subdir': 'matplotlib',
