hrev51157 adds 1 changeset to branch 'master'
old head: 026b9812f2c5b7b39a16e3e3643d0295243085fb
new head: e3e02f20925fbfdb1578f3490023a9e2f925556b
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=e3e02f20925f+%5E026b9812f2c5
----------------------------------------------------------------------------
e3e02f20925f: Make fontconfig dependency feature dependent.
[ Jérôme Duval <jerome.duval@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev51157
Commit: e3e02f20925fbfdb1578f3490023a9e2f925556b
URL: http://cgit.haiku-os.org/haiku/commit/?id=e3e02f20925f
Author: Jérôme Duval <jerome.duval@xxxxxxxxx>
Date: Wed May 10 20:37:38 2017 UTC
----------------------------------------------------------------------------
3 files changed, 9 insertions(+), 3 deletions(-)
src/data/package_infos/x86/haiku | 4 +++-
src/data/package_infos/x86_64/haiku | 4 +++-
src/data/package_infos/x86_gcc2/haiku | 4 +++-
----------------------------------------------------------------------------
diff --git a/src/data/package_infos/x86/haiku b/src/data/package_infos/x86/haiku
index 390a7c3..aa93a73 100644
--- a/src/data/package_infos/x86/haiku
+++ b/src/data/package_infos/x86/haiku
@@ -62,8 +62,10 @@ requires {
cmd:unzip
#endif
lib:libcurl
- lib:libfreetype
+#ifdef HAIKU_BUILD_FEATURE_X86_FONTCONFIG_ENABLED
lib:libfontconfig
+#endif
+ lib:libfreetype
lib:libgcc_s
lib:libicudata >= 57
lib:libicui18n >= 57
diff --git a/src/data/package_infos/x86_64/haiku
b/src/data/package_infos/x86_64/haiku
index 7dab3fe..c747bd3 100644
--- a/src/data/package_infos/x86_64/haiku
+++ b/src/data/package_infos/x86_64/haiku
@@ -61,8 +61,10 @@ requires {
cmd:unzip
#endif
lib:libcurl
- lib:libfreetype
+#ifdef HAIKU_BUILD_FEATURE_X86_64_FONTCONFIG_ENABLED
lib:libfontconfig
+#endif
+ lib:libfreetype
lib:libgcc_s
lib:libicudata >= 57
lib:libicui18n >= 57
diff --git a/src/data/package_infos/x86_gcc2/haiku
b/src/data/package_infos/x86_gcc2/haiku
index 3bfba00..77896b8 100644
--- a/src/data/package_infos/x86_gcc2/haiku
+++ b/src/data/package_infos/x86_gcc2/haiku
@@ -63,8 +63,10 @@ requires {
cmd:unzip
#endif
lib:libcurl
- lib:libfreetype
+#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_FONTCONFIG_ENABLED
lib:libfontconfig
+#endif
+ lib:libfreetype
lib:libicudata >= 57
lib:libicui18n >= 57
lib:libicuio >= 57
