NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dillo: zlib is a mandatory dependency

Browse Source 
Fixes:
http://autobuild.buildroot.net/results/10f/10f7ba386a13753c942139b8bc13ca74d8932f3a/

Also reorder variables a bit and ditch duplicate addition.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Gustavo Zacarias 2015-01-08 15:18:58 -03:00 committed by Thomas Petazzoni
parent 6c782df7b8
commit 6a570acfca
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/dillo/Config.in
View File

@ -5,6 +5,7 @@ config BR2_PACKAGE_DILLO
depends on BR2_USE_MMU # fltk fork() depends on BR2_USE_MMU # fltk fork()
select BR2_PACKAGE_FLTK select BR2_PACKAGE_FLTK
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
select BR2_PACKAGE_ZLIB
help help
Dillo is a multi-platform graphical web browser known Dillo is a multi-platform graphical web browser known
for its speed and small footprint. for its speed and small footprint.

7
package/dillo/dillo.mk
View File

@ -11,13 +11,10 @@ DILLO_LICENSE = GPLv3+
DILLO_LICENSE_FILES = COPYING DILLO_LICENSE_FILES = COPYING
# For 0001-configure.ac-change-fltk-config-test-to-be-more-cros.patch # For 0001-configure.ac-change-fltk-config-test-to-be-more-cros.patch
DILLO_AUTORECONF = YES DILLO_AUTORECONF = YES
DILLO_DEPENDENCIES = fltk zlib \
DILLO_DEPENDENCIES = fltk $(if $(BR2_PACKAGE_LIBICONV),libiconv)
DILLO_CONF_ENV = ac_cv_path_FLTK_CONFIG=$(STAGING_DIR)/usr/bin/fltk-config DILLO_CONF_ENV = ac_cv_path_FLTK_CONFIG=$(STAGING_DIR)/usr/bin/fltk-config
DILLO_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv)
ifeq ($(BR2_PACKAGE_OPENSSL),y) ifeq ($(BR2_PACKAGE_OPENSSL),y)
DILLO_CONF_OPTS += --enable-ssl DILLO_CONF_OPTS += --enable-ssl
DILLO_DEPENDENCIES += openssl DILLO_DEPENDENCIES += openssl