From d0d349272d0a82943b6313f33ebf1ff54ce09e33 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 1 Jun 2019 02:19:23 +0200 Subject: [PATCH] - system-libs.mk: update libpng build --- make/system-libs.mk | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/make/system-libs.mk b/make/system-libs.mk index a0b886ab..cd173b22 100644 --- a/make/system-libs.mk +++ b/make/system-libs.mk @@ -201,7 +201,7 @@ LIBPNG_PATCH = libpng-Disable-pngfix-and-png-fix-itxt.patch LIBPNG_CONF = ifneq ($(BOXSERIES), hd51) - LIBPNG_CONF = --disable-arm-neon + LIBPNG_CONF = --disable-arm-neon endif $(D)/libpng: $(ARCHIVE)/libpng-$(LIBPNG_VER).tar.xz $(D)/zlib | $(TARGET_DIR) @@ -210,15 +210,18 @@ $(D)/libpng: $(ARCHIVE)/libpng-$(LIBPNG_VER).tar.xz $(D)/zlib | $(TARGET_DIR) $(CHDIR)/libpng-$(LIBPNG_VER); \ $(call apply_patches, $(LIBPNG_PATCH)); \ $(CONFIGURE) \ - --prefix=$(TARGET_DIR) \ - --bindir=$(HOST_DIR)/bin \ - --mandir=$(BUILD_TMP)/.remove \ + --prefix= \ + --mandir=/.remove \ --enable-silent-rules \ $(LIBPNG_CONF) \ --disable-static \ ; \ - ECHO=echo $(MAKE) all; \ - make install + $(MAKE) all; \ + $(MAKE) install DESTDIR=$(TARGET_DIR) + mv $(TARGET_DIR)/bin/libpng*-config $(HOST_DIR)/bin/ + $(REWRITE_CONFIG) $(HOST_DIR)/bin/libpng16-config + $(REWRITE_PKGCONF)/libpng16.pc + $(REWRITE_LIBTOOL)/libpng16.la $(REMOVE)/libpng-$(LIBPNG_VER) $(TOUCH)