summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHirokazu MORIKAWA2017-02-24 08:31:24 +0000
committerHirokazu MORIKAWA2017-02-24 08:31:24 +0000
commit4abf8f4ae343e2354050ac1adcdf2c2e085e1d84 (patch)
treeaa321e00750cb501fd0f3b5e0f32f8fc6699efd4
parent52481f493d89bfacb3b3f9dfa3978f3ddd264e31 (diff)
downloadpackages-4abf8f4ae343e2354050ac1adcdf2c2e085e1d84.tar.gz
icu: Added icu-config installation to InstallDev
Maintainer: me Compile tested: ar71xx, mips_24kc_gcc-6.3.0_musl, LEDE trunk r3576-ea24d87 Run tested: NONE Description: "php7-mod-intl" build fail, because of lacking icu-config. Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>
-rw-r--r--libs/icu/Makefile32
1 files changed, 12 insertions, 20 deletions
diff --git a/libs/icu/Makefile b/libs/icu/Makefile
index 4c232cabe1..58234d415c 100644
--- a/libs/icu/Makefile
+++ b/libs/icu/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=icu4c
PKG_VERSION:=58.2
-PKG_RELEASE:=4
+PKG_RELEASE:=5
PKG_SOURCE:=$(PKG_NAME)-58_2-src.tgz
PKG_SOURCE_URL:=http://download.icu-project.org/files/$(PKG_NAME)/$(PKG_VERSION)
@@ -79,19 +79,15 @@ HOST_CONFIGURE_ARGS:= \
--prefix=$(STAGING_DIR_HOSTPKG)
define Build/InstallDev
- $(INSTALL_DIR) \
- $(1)/usr/include
-
- $(CP) \
- $(PKG_INSTALL_DIR)/usr/include/* \
- $(1)/usr/include/
-
- $(INSTALL_DIR) \
- $(1)/usr/lib
-
- $(CP) \
- $(PKG_INSTALL_DIR)/usr/lib/* \
- $(1)/usr/lib/
+ $(INSTALL_DIR) $(1)/usr/include
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(INSTALL_DIR) $(1)/usr/bin
+ $(INSTALL_DIR) $(2)/bin
+ $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/icu-config $(1)/usr/bin/
+ $(SED) 's,^\(prefix\|execprefix\)=.*,\1=$(STAGING_DIR)/usr,g' $(1)/usr/bin/icu-config
+ $(LN) $(STAGING_DIR)/usr/bin/icu-config $(2)/bin/
endef
define Host/Install
@@ -105,12 +101,8 @@ define Host/Install
endef
define Package/icu/install
- $(INSTALL_DIR) \
- $(1)/usr/lib
-
- $(CP) \
- $(PKG_INSTALL_DIR)/usr/lib/*.so* \
- $(1)/usr/lib/
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/
endef
$(eval $(call BuildPackage,icu))