From 1cfd297433871267b9a247eb3d00122928facb88 Mon Sep 17 00:00:00 2001 From: rdb Date: Sun, 17 Nov 2019 20:37:33 +0100 Subject: [PATCH] makepanda: specify freetype library after harfbuzz as well This fixes static linking of harfbuzz and freetype, which have a circular dependency on each other. --- makepanda/makepanda.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 9124dc3b2d..48b2ef1da9 100755 --- a/makepanda/makepanda.py +++ b/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")