From patchwork Thu Sep 26 23:21:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Spenser Gilliland X-Patchwork-Id: 278301 X-Patchwork-Delegate: patrickdepinguin+buildroot@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id C79822C00D1 for ; Fri, 27 Sep 2013 09:22:48 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8BA958B709; Thu, 26 Sep 2013 23:22:47 +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 N15a3bAqkiKR; Thu, 26 Sep 2013 23:22:44 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 2245B8BF99; Thu, 26 Sep 2013 23:22:24 +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 007B21BF98C for ; Thu, 26 Sep 2013 23:22:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id EBC7E8AD95 for ; Thu, 26 Sep 2013 23:22:14 +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 v5zeSkmWBoB6 for ; Thu, 26 Sep 2013 23:22:12 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by whitealder.osuosl.org (Postfix) with ESMTPS id 52A3A8BF4F for ; Thu, 26 Sep 2013 23:22:12 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id u16so2384439iet.39 for ; Thu, 26 Sep 2013 16:22:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=H6RuhmLe0PuHAmmEEOz9WltOFqe0wTPsswLppZJZLA8=; b=m6rFEPp14GxC9qxrFXDeMWG9NLKKvZG7RU8RPWv073U41chBMs1O3Lw5k0PeE7vy9c /GMO43NjxFmO/QNA8DYy/H40uxXehz2nPtXQciws1LV4RSZv5nywzkv+Ilt2eaW7N4+G j9g7EEyOHYA5Q1oAJEqIwCEu3dfjeyQEJ0MNIhNie0HvY8GdG6aiu8ZV86qyQj39pmxV YRZI7mcptzz9KLNn+FDUm3g/HU7yv03IhwYIodEVd1IBd7Ddmy5IK1FlGBOowfU8sXUx Nb5+nSfE0BpFxYyudG6eTUsOyHz+hM5wDJNKCdcHI7zdj6/iClFOMv8udA8j4wsIVlOt WHnw== X-Gm-Message-State: ALoCoQm0ewE7b9SR/lR6VVxPybktChYkzGcs+wCUJ4zd3GuFcd/6/Gkh4AtyFK4RzEjKXiFKYm7Q X-Received: by 10.43.49.8 with SMTP id uy8mr4161176icb.73.1380237731703; Thu, 26 Sep 2013 16:22:11 -0700 (PDT) Received: from localhost.localdomain (dhcp138.ece.iit.edu. [216.47.144.138]) by mx.google.com with ESMTPSA id yt10sm1006232igb.9.1969.12.31.16.00.00 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 26 Sep 2013 16:22:11 -0700 (PDT) From: Spenser Gilliland To: buildroot@busybox.net Date: Thu, 26 Sep 2013 18:21:52 -0500 Message-Id: <1380237714-2470-10-git-send-email-spenser@gillilanding.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1380237714-2470-1-git-send-email-spenser@gillilanding.com> References: <1380237714-2470-1-git-send-email-spenser@gillilanding.com> Subject: [Buildroot] [PATCH v3 09/11] libpng: ensure libpng12 is installed before libpng 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: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net This ensures that libpng (which is a newer version) is used when a specific version of libpng (i.e. libpng12) is not selected. Signed-off-by: Spenser Gilliland --- package/libpng/libpng.mk | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk index f5bf956..033587e 100644 --- a/package/libpng/libpng.mk +++ b/package/libpng/libpng.mk @@ -14,5 +14,9 @@ LIBPNG_INSTALL_STAGING = YES LIBPNG_DEPENDENCIES = host-pkgconf zlib LIBPNG_CONFIG_SCRIPTS = libpng$(LIBPNG_SERIES)-config libpng-config +# Ensure this libpng is the last installed in the case of multiple libpng +# installs. +LIBPNG_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBPNG12),libpng12) + $(eval $(autotools-package)) $(eval $(host-autotools-package))