[Buildroot] [git commit] package/freetype: drop libpng workaround
Yann E. MORIN
yann.morin.1998 at free.fr
Thu Oct 1 20:57:19 UTC 2020
commit: https://git.buildroot.net/buildroot/commit/?id=005a3437a5eee0300f6a8d9974d7a94e5ef723ac
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
libpng workaround which has been added with commit
f7313cadf2ca9e0195a873f62f6b6c38a58a3630 is not needed since version
2.5.3 and
https://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=00c79ed9680a0d7a367c6914adc7485391299542
Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998 at free.fr>
---
package/freetype/freetype.mk | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
index 516d1c0cfc..428531ed08 100644
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -37,9 +37,7 @@ endif
ifeq ($(BR2_PACKAGE_LIBPNG),y)
FREETYPE_DEPENDENCIES += libpng
-FREETYPE_CONF_OPTS += LIBPNG_CFLAGS="`$(STAGING_DIR)/usr/bin/libpng-config --cflags`" \
- LIBPNG_LDFLAGS="`$(STAGING_DIR)/usr/bin/libpng-config --ldflags`"
-FREETYPE_LIBPNG_LIBS = "`$(STAGING_DIR)/usr/bin/libpng-config --libs`"
+FREETYPE_CONF_OPTS += --with-png
else
FREETYPE_CONF_OPTS += --without-png
endif
@@ -52,14 +50,5 @@ define FREETYPE_FIX_CONFIG_FILE
endef
FREETYPE_POST_INSTALL_STAGING_HOOKS += FREETYPE_FIX_CONFIG_FILE
-# libpng isn't included in freetype-config & freetype2.pc :-/
-define FREETYPE_FIX_CONFIG_FILE_LIBS
- $(SED) "s,^Libs.private:,& $(FREETYPE_LIBPNG_LIBS)," \
- $(STAGING_DIR)/usr/lib/pkgconfig/freetype2.pc
- $(SED) "s,-lfreetype,& $(FREETYPE_LIBPNG_LIBS)," \
- $(STAGING_DIR)/usr/bin/freetype-config
-endef
-FREETYPE_POST_INSTALL_STAGING_HOOKS += FREETYPE_FIX_CONFIG_FILE_LIBS
-
$(eval $(autotools-package))
$(eval $(host-autotools-package))
More information about the buildroot
mailing list