summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2010-06-25 09:31:42 (GMT)
committer Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2010-07-06 08:32:35 (GMT)
commit9dd1a03a78adfd28cb1c1c1844af86bbae7eaff7 (patch)
treeab17574322c3e5b3a688aee727cc455f9edf9e45
parentecb7642cce36bc68d93f0eee677adc7da538228d (diff)
downloadbuildroot-9dd1a03a78adfd28cb1c1c1844af86bbae7eaff7.tar.gz
buildroot-9dd1a03a78adfd28cb1c1c1844af86bbae7eaff7.tar.bz2
webkit: fix misc build issues
Webkit depends on libjpeg, so add it as a dependency. Webkit also uses icu but fails to find it if we don't pass ac_cv_path_icu_config to its ./configure script. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/webkit/webkit.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/package/webkit/webkit.mk b/package/webkit/webkit.mk
index 39debd3..fc355ce 100644
--- a/package/webkit/webkit.mk
+++ b/package/webkit/webkit.mk
@@ -12,8 +12,9 @@ WEBKIT_INSTALL_TARGET = YES
WEBKIT_LIBTOOL_PATCH = NO
WEBKIT_DEPENDENCIES = host-flex host-gperf icu curl libxml2 libxslt \
- libgtk2 sqlite enchant libsoup
+ libgtk2 sqlite enchant libsoup jpeg
+WEBKIT_CONF_ENV = ac_cv_path_icu_config=$(STAGING_DIR)/usr/bin/icu-config
ifeq ($(BR2_PACKAGE_XORG7),y)
WEBKIT_CONF_OPT += --with-target=x11