2018-09-19 20:39:07 +02:00
|
|
|
From 0118d791f8fba7fdadc92ed6884b2ff4de7abf22 Mon Sep 17 00:00:00 2001
|
2017-01-23 21:37:13 +01:00
|
|
|
From: Martchus <martchus@gmx.net>
|
|
|
|
Date: Sun, 18 Sep 2016 14:22:56 +0200
|
2018-09-19 20:39:07 +02:00
|
|
|
Subject: [PATCH 12/33] Fix linking against static harfbuzz
|
2017-01-23 21:37:13 +01:00
|
|
|
|
|
|
|
---
|
|
|
|
src/gui/configure.json | 6 +++++-
|
|
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
|
|
|
|
diff --git a/src/gui/configure.json b/src/gui/configure.json
|
2018-05-23 20:56:49 +02:00
|
|
|
index afa3d95f39..a2b0a00d09 100644
|
2017-01-23 21:37:13 +01:00
|
|
|
--- a/src/gui/configure.json
|
|
|
|
+++ b/src/gui/configure.json
|
2018-02-15 00:14:36 +01:00
|
|
|
@@ -218,7 +218,11 @@
|
2017-10-13 21:29:48 +02:00
|
|
|
]
|
|
|
|
},
|
2017-01-23 21:37:13 +01:00
|
|
|
"sources": [
|
|
|
|
- "-lharfbuzz"
|
|
|
|
+ { "type": "pkgConfig", "args": "--static --libs harfbuzz", "condition": "!features.shared" },
|
|
|
|
+ { "type": "pkgConfig", "args": "--libs harfbuzz", "condition": "features.shared" },
|
|
|
|
+ { "libs": "-lharfbuzz -lfreetype -lharfbuzz -lglib-2.0 -lintl -lws2_32 -lole32 -lwinmm -lshlwapi -lpcre -lintl -lpcre -lintl -liconv -lgraphite2 -lbz2", "condition": "!features.shared" },
|
|
|
|
+ { "libs": "-Wl,-Bdynamic -lharfbuzz -Wl,-Bstatic", "condition": "!features.shared" },
|
|
|
|
+ { "libs": "-lharfbuzz", "condition": "features.shared" }
|
|
|
|
]
|
|
|
|
},
|
|
|
|
"imf": {
|
|
|
|
--
|
2018-09-19 20:39:07 +02:00
|
|
|
2.19.0
|
2017-01-23 21:37:13 +01:00
|
|
|
|