From patchwork Mon Oct 28 16:02:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 286590 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id B05C42C00BB for ; Tue, 29 Oct 2013 03:02:37 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 9CF1D93655; Mon, 28 Oct 2013 16:02:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eHRwv4mDJcAw; Mon, 28 Oct 2013 16:02:32 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 8E92891FAC; Mon, 28 Oct 2013 16:02:32 +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 9239F1BF9B8 for ; Mon, 28 Oct 2013 16:02:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8B60B8B1B2 for ; Mon, 28 Oct 2013 16:02:31 +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 T74qgKPLG7Du for ; Mon, 28 Oct 2013 16:02:29 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f172.google.com (mail-wi0-f172.google.com [209.85.212.172]) by whitealder.osuosl.org (Postfix) with ESMTPS id 55E1A88894 for ; Mon, 28 Oct 2013 16:02:29 +0000 (UTC) Received: by mail-wi0-f172.google.com with SMTP id ez12so4097132wid.11 for ; Mon, 28 Oct 2013 09:02:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-type; bh=RuCqwtLjzNbyU7lt79HrVoXoQN3A7mPaNedm/lzLtvk=; b=CxCLGbgpz0H9erRQDE/AQW9Q1m/TqRll6N9DdTHPvFXo5vfdonxAx7P0munLxxSCHQ e7ZGQYUmCN1R7BSUTKOQwpE2wzVOdWw4fKbvbteYS1hrDRmCL5N78JDBmaVhlO99jLnw ftNi/RPqjsk5KmdxwVWB4wTlr8kjG2JlcgTgDON+SRYWANHACzmYJUWBV+HdwtbKOf7U G9XGIWhAGucNUtHe18ZhzpuTa8RmmRruZk2HsSRbF8+PenX1T4Pg/rswlzAgdv+AJT7T OqxqcDgpilBaEm0+zRMK2VXqxYLqWW2740jRRLkxziBJ5/h+J1qdtsuGcGbQvNIs9cNT O5Vg== X-Received: by 10.180.94.38 with SMTP id cz6mr9698454wib.27.1382976147912; Mon, 28 Oct 2013 09:02:27 -0700 (PDT) Received: from dell.be.48ers.dk ([91.183.168.190]) by mx.google.com with ESMTPSA id ft19sm37210901wic.5.2013.10.28.09.02.26 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 28 Oct 2013 09:02:27 -0700 (PDT) Received: from peko by dell.be.48ers.dk with local (Exim 4.80) (envelope-from ) id 1VapGr-0003Ur-Nk; Mon, 28 Oct 2013 17:02:25 +0100 From: Peter Korsgaard To: Gustavo Zacarias References: <1382914459-30545-1-git-send-email-gustavo@zacarias.com.ar> Date: Mon, 28 Oct 2013 17:02:25 +0100 In-Reply-To: <1382914459-30545-1-git-send-email-gustavo@zacarias.com.ar> (Gustavo Zacarias's message of "Sun, 27 Oct 2013 19:54:17 -0300") Message-ID: <87bo29s7se.fsf@dell.be.48ers.dk> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.4 (gnu/linux) MIME-Version: 1.0 Cc: buildroot@busybox.net Subject: Re: [Buildroot] [PATCH 1/3] libpng: disable tools X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net >>>>> "Gustavo" == Gustavo Zacarias writes: > They can fail on some odd toolchain configurations because of > buildsystem shortcomings and aren't expected to be used in normal > scenarios. > Signed-off-by: Gustavo Zacarias > --- > package/libpng/libpng-01-disable-tools.patch | 30 ++++++++++++++++++++++++++++ > 1 file changed, 30 insertions(+) > create mode 100644 package/libpng/libpng-01-disable-tools.patch > diff --git a/package/libpng/libpng-01-disable-tools.patch b/package/libpng/libpng-01-disable-tools.patch > new file mode 100644 > index 0000000..cd7040c > --- /dev/null > +++ b/package/libpng/libpng-01-disable-tools.patch > @@ -0,0 +1,30 @@ > +Disable the new pngfix and png-fix-itxt tools: they take up space, fail to > +build on some oddball toolchain configurations and aren't expected/needed > +in a non-interactive embedded system. > + > +Signed-off-by: Gustavo Zacarias > + > +diff -Nura libpng-1.6.6.orig/Makefile.am libpng-1.6.6/Makefile.am My first thought upon seeing this was that it would be cleaner to just pass bin_PROGRAMS= to make instead of patching the autotools files, but it also ends up quite ugly (especially as we need to tweak the variables AFTER the evals if we want to append to the default values): So it probably makes more sense to just patch Makefile.am / Makefile.in like you do - Committed, thanks. diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk index 5ce828e..56b1cd3 100644 --- a/package/libpng/libpng.mk +++ b/package/libpng/libpng.mk @@ -17,3 +17,12 @@ LIBPNG_CONF_OPT = $(if $(BR2_ARM_CPU_HAS_NEON),--enable-arm-n $(eval $(autotools-package)) $(eval $(host-autotools-package)) + +# disable pngfix / png-fix-itxt tools: They take up space, fail to +# build on oddball toolchain configurations and generally aren't +# expected/needed on the target +LIBPNG_MAKE_OPT = bin_PROGRAMS= +LIBPNG_INSTALL_STAGING_OPT += $(LIBPNG_MAKE_OPT) +LIBPNG_INSTALL_TARGET_OPT += $(LIBPNG_MAKE_OPT) +HOST_LIBPNG_MAKE_OPT = $(LIBPNG_MAKE_OPT) +HOST_LIBPNG_INSTALL_OPT += $(LIBPNG_MAKE_OPT)