Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libfreetype: restore host build

Browse source 
Restore host building on request from a user. Apparently, packages
outside of openwrt/packages feed rely on Freetype 2 building on host.

While at it, remove sed-editing of freetype-config that is no longer
necessary. The current version of freetype-config correctly identifies
prefix, exec_prefix, includedir and libdir.

Signed-off-by: Val Kulkov <val.kulkov@gmail.com>
This commit is contained in:
Val Kulkov 2017-11-20 15:42:18 -05:00
parent f569495832
commit d71da65581
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libs/freetype/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=freetype PKG_NAME:=freetype
PKG_VERSION:=2.8.1 PKG_VERSION:=2.8.1
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=@SF/freetype PKG_SOURCE_URL:=@SF/freetype
@ -56,6 +56,8 @@ endef
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(1)/bin $(INSTALL_DIR) $(1)/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/freetype-config $(1)/bin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/freetype-config $(1)/bin/
$(INSTALL_DIR) $(2)/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/freetype-config $(2)/bin/
$(INSTALL_DIR) $(1)/usr/include $(INSTALL_DIR) $(1)/usr/include
$(CP) $(PKG_INSTALL_DIR)/usr/include/freetype2 $(1)/usr/include/ $(CP) $(PKG_INSTALL_DIR)/usr/include/freetype2 $(1)/usr/include/
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
@ -63,11 +65,6 @@ define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/freetype2.pc $(1)/usr/lib/pkgconfig/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/freetype2.pc $(1)/usr/lib/pkgconfig/
$(SED) \
's,^\(prefix\|exec_prefix\)=.*,\1="$(STAGING_DIR)/usr",; \
s,^\(includedir\)=.*,\1="$(STAGING_DIR)/usr/include",; \
s,^\(libdir\)=.*,\1="$(STAGING_DIR)/usr/lib",' \
$(1)/bin/freetype-config
$(SED) \ $(SED) \
's,/usr/include,$$$${prefix}/include,g; \ 's,/usr/include,$$$${prefix}/include,g; \
s,/usr/lib,$$$${exec_prefix}/lib,g' \ s,/usr/lib,$$$${exec_prefix}/lib,g' \
@ -80,4 +77,5 @@ define Package/libfreetype/install
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfreetype.so.* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfreetype.so.* $(1)/usr/lib/
endef endef
$(eval $(call HostBuild))
$(eval $(call BuildPackage,libfreetype)) $(eval $(call BuildPackage,libfreetype))