Skip to content
Permalink
Browse files

makepanda: specify freetype library after harfbuzz as well

This fixes static linking of harfbuzz and freetype, which have a circular dependency on each other.
  • Loading branch information
rdb committed Nov 17, 2019
1 parent 92476a3 commit 1cfd297433871267b9a247eb3d00122928facb88
Showing with 7 additions and 0 deletions.
  1. +7 −0 makepanda/makepanda.py
@@ -948,6 +948,13 @@ def parseopts(args):
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")

0 comments on commit 1cfd297

Please sign in to comment.
You can’t perform that action at this time.