aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Adrián Pérez de Castro <aperez@igalia.com>2017-07-05 22:46:53 +0300
committerGravatar Peter Korsgaard <peter@korsgaard.com>2017-07-19 16:06:25 +0200
commit9597818b5a7845154893bd37abddd9233b9e5a83 (patch)
treea7ef51296cd076e15772525a688ac90e133bcbae
parentf58e4d403fd3ff66a2fc2c17480721f75c0eaf4a (diff)
downloadbuildroot-9597818b5a7845154893bd37abddd9233b9e5a83.tar.gz
buildroot-9597818b5a7845154893bd37abddd9233b9e5a83.tar.bz2
webkitgtk: select libgcrypt
Libgrcrypt is a direct dependency of WebKitGTK+, and as such it should be selected. Signed-off-by: Adrian Perez de Castro <aperez@igalia.com> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> [Thomas: add missing dependency on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> (cherry picked from commit b61c805fcaf8980a3dbcd23c444660f7f5327ecf) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/webkitgtk/Config.in2
-rw-r--r--package/webkitgtk/webkitgtk.mk2
2 files changed, 3 insertions, 1 deletions
diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in
index 0e53d06379..2885b2f1a2 100644
--- a/package/webkitgtk/Config.in
+++ b/package/webkitgtk/Config.in
@@ -9,6 +9,7 @@ config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
# Disabled on SuperH because of segfault
depends on BR2_USE_MMU # libglib2
depends on BR2_TOOLCHAIN_HAS_SYNC_4
+ depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt
comment "webkitgtk needs libgtk3 and a glibc toolchain w/ C++, gcc >= 4.9"
depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
@@ -30,6 +31,7 @@ config BR2_PACKAGE_WEBKITGTK
select BR2_PACKAGE_HARFBUZZ
select BR2_PACKAGE_ICU
select BR2_PACKAGE_JPEG
+ select BR2_PACKAGE_LIBGCRYPT
select BR2_PACKAGE_LIBSECRET
select BR2_PACKAGE_LIBSOUP
select BR2_PACKAGE_LIBXML2
diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk
index cc8d960e47..ef20839f92 100644
--- a/package/webkitgtk/webkitgtk.mk
+++ b/package/webkitgtk/webkitgtk.mk
@@ -13,7 +13,7 @@ WEBKITGTK_LICENSE_FILES = \
Source/WebCore/LICENSE-APPLE \
Source/WebCore/LICENSE-LGPL-2.1
WEBKITGTK_DEPENDENCIES = host-ruby host-flex host-bison host-gperf \
- enchant harfbuzz icu jpeg libgtk3 libsecret libsoup \
+ enchant harfbuzz icu jpeg libgcrypt libgtk3 libsecret libsoup \
libxml2 libxslt sqlite webp
WEBKITGTK_CONF_OPTS = \
-DENABLE_API_TESTS=OFF \