diff options
Diffstat (limited to '0010-Fix-linking-against-static-freetype2.patch')
| -rw-r--r-- | 0010-Fix-linking-against-static-freetype2.patch | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/0010-Fix-linking-against-static-freetype2.patch b/0010-Fix-linking-against-static-freetype2.patch index 4b6cf4e43cbf..df45a37bd830 100644 --- a/0010-Fix-linking-against-static-freetype2.patch +++ b/0010-Fix-linking-against-static-freetype2.patch @@ -1,30 +1,29 @@ -From 3c9bf1e7fcd5f965d9f3a91d05d762d6f4061a5e Mon Sep 17 00:00:00 2001 +From c1019300eed7fabb7c2c73d5510e5a83e06a89b2 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Fri, 3 Feb 2017 20:51:19 +0100 -Subject: [PATCH 10/31] Fix linking against static freetype2 +Subject: [PATCH 10/32] Fix linking against static freetype2 --- - src/gui/configure.json | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) + src/gui/configure.json | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gui/configure.json b/src/gui/configure.json -index 099c11da95..872deb3ad3 100644 +index bc3eae90872..d9b540ce428 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json -@@ -239,8 +239,11 @@ +@@ -238,8 +238,10 @@ }, "headers": "ft2build.h", "sources": [ - { "type": "pkgConfig", "args": "freetype2" }, - { "type": "freetype", "libs": "-lfreetype", "condition": "!config.wasm" }, -+ { "type": "pkgConfig", "args": "--static --libs freetype2", "condition": "!features.shared" }, + { "type": "pkgConfig", "args": "--libs freetype2", "condition": "features.shared" }, -+ { "libs": "-lfreetype -lharfbuzz -lfreetype -lglib-2.0 -lintl -lws2_32 -lole32 -lwinmm -lshlwapi -lpcre -lintl -lpcre -lintl -liconv -lgraphite2 -lbz2", "condition": "!features.shared && !config.wasm" }, ++ { "libs": "-lfreetype -lharfbuzz -lfreetype -lbrotlidec -lbrotlicommon -lglib-2.0 -lintl -lws2_32 -lole32 -lwinmm -lshlwapi -lpcre2-8 -lintl -lpcre2-8 -lintl -liconv -lgraphite2 -lbz2", "condition": "!features.shared && !config.wasm" }, + { "libs": "-Wl,-Bdynamic -lfreetype -Wl,-Bstatic", "condition": "!features.shared && !config.wasm" }, + { "libs": "-lfreetype", "condition": "features.shared && !config.wasm" }, { "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" }, { "libs": "-lfreetype" } ], -- -2.25.0 +2.44.0 |