Browse Source

makepanda: specify freetype library after harfbuzz as well

This fixes static linking of harfbuzz and freetype, which have a circular dependency on each other.
rdb 6 years ago
parent
commit
1cfd297433
1 changed files with 7 additions and 0 deletions
  1. 7 0
      makepanda/makepanda.py

+ 7 - 0
makepanda/makepanda.py

@@ -948,6 +948,13 @@ if (COMPILER=="GCC"):
         SmartPkgEnable("JPEG",      "",          ("jpeg"), "jpeglib.h")
         SmartPkgEnable("PNG",       "libpng",    ("png"), "png.h", tool = "libpng-config")
 
+        # Copy freetype libraries to be specified after harfbuzz libraries as well,
+        # because there's a circular dependency between the two libraries.
+        if not PkgSkip("FREETYPE") and not PkgSkip("HARFBUZZ"):
+            for (opt, name) in LIBNAMES:
+                if opt == "FREETYPE":
+                    LibName("HARFBUZZ", name)
+
         if not PkgSkip("FFMPEG"):
             if GetTarget() == "darwin":
                 LibName("FFMPEG", "-Wl,-read_only_relocs,suppress")