From patchwork Thu Jan 8 18:18:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 426808 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id C9543140129 for ; Fri, 9 Jan 2015 05:21:26 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 1645732CAC; Thu, 8 Jan 2015 18:21:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NCtTjzyFMrVk; Thu, 8 Jan 2015 18:21:22 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id EE41C32CB1; Thu, 8 Jan 2015 18:21:21 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 6604B1C2990 for ; Thu, 8 Jan 2015 18:21:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 61FBE8B044 for ; Thu, 8 Jan 2015 18:21:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VE46oOjd+FhW for ; Thu, 8 Jan 2015 18:21:19 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from www.zacarias.com.ar (www.zacarias.com.ar [62.210.192.172]) by whitealder.osuosl.org (Postfix) with ESMTPS id 1B5BF8B034 for ; Thu, 8 Jan 2015 18:21:18 +0000 (UTC) Received: from asgard (cpe-181-46-99-160.telecentro-reversos.com.ar [181.46.99.160] (may be forged)) (authenticated bits=0) by www.zacarias.com.ar (8.14.9/8.14.9) with ESMTP id t08ILBQJ029163 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 8 Jan 2015 18:21:15 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1420741276; bh=PXb8qdkhCBofALQGeRZ3BbXV/csBC1ktW+ItobFB5Ng=; h=From:To:Cc:Subject:Date; b=WUoX3GlwPzGf8t5VWeyE1N6vLFiwbvV1EeunfCOl5dbjajv5TKkQm2l884sx6P48n svkc6JeptizPuY/+A+hZnPzydqt7Zppy20ZSEbJPyY9Mx24B0dQsbxxxoS+CsUzPFt i/oqfWOQZ0IVIo3goWglqeqgTA013ummz0zRND7s= Received: by asgard (sSMTP sendmail emulation); Thu, 08 Jan 2015 15:18:58 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Thu, 8 Jan 2015 15:18:58 -0300 Message-Id: <1420741138-11738-1-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 2.0.5 X-Virus-Scanned: clamav-milter 0.98.5 at www X-Virus-Status: Clean Subject: [Buildroot] [PATCH] dillo: zlib is a mandatory dependency X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fixes: http://autobuild.buildroot.net/results/10f/10f7ba386a13753c942139b8bc13ca74d8932f3a/ Also reorder variables a bit and ditch duplicate addition. Signed-off-by: Gustavo Zacarias --- package/dillo/Config.in | 1 + package/dillo/dillo.mk | 7 ++----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/package/dillo/Config.in b/package/dillo/Config.in index 5c2cc62..d06f2d1 100644 --- a/package/dillo/Config.in +++ b/package/dillo/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_DILLO depends on BR2_USE_MMU # fltk fork() select BR2_PACKAGE_FLTK select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE + select BR2_PACKAGE_ZLIB help Dillo is a multi-platform graphical web browser known for its speed and small footprint. diff --git a/package/dillo/dillo.mk b/package/dillo/dillo.mk index c216322..9bdd56f 100644 --- a/package/dillo/dillo.mk +++ b/package/dillo/dillo.mk @@ -11,13 +11,10 @@ DILLO_LICENSE = GPLv3+ DILLO_LICENSE_FILES = COPYING # For 0001-configure.ac-change-fltk-config-test-to-be-more-cros.patch DILLO_AUTORECONF = YES - -DILLO_DEPENDENCIES = fltk - +DILLO_DEPENDENCIES = fltk zlib \ + $(if $(BR2_PACKAGE_LIBICONV),libiconv) 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) DILLO_CONF_OPTS += --enable-ssl DILLO_DEPENDENCIES += openssl