Patchwork [v3,09/11] libpng: ensure libpng12 is installed before libpng

login
register
mail settings
Submitter Spenser Gilliland
Date Sept. 26, 2013, 11:21 p.m.
Message ID <1380237714-2470-10-git-send-email-spenser@gillilanding.com>
Download mbox | patch
Permalink /patch/278301/
State Changes Requested
Delegated to: Thomas De Schampheleire
Headers show

Comments

Spenser Gilliland - Sept. 26, 2013, 11:21 p.m.
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 <spenser@gillilanding.com>
---
 package/libpng/libpng.mk |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

Patch

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))