diff options
| author | Rosen Penev <rosenp@gmail.com> | 2019-12-12 19:52:00 -0800 |
|---|---|---|
| committer | Rosen Penev <rosenp@gmail.com> | 2020-01-08 16:01:18 -0800 |
| commit | 825b7016e228e931e8304b737ddad59d16f34911 (patch) | |
| tree | 80c646da1ad3518436fa8ad0c6eafc229e5fc9e2 /utils/zsh | |
| parent | 2e992a0794f64705338b190a72c3e2a21f83656d (diff) | |
zsh: Update to 5.7.1
Remove --disable-dynamic. It disables regex support.
Installed extra lib files.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'utils/zsh')
| -rw-r--r-- | utils/zsh/Makefile | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/utils/zsh/Makefile b/utils/zsh/Makefile index a2e37ca1f..d4a1b353f 100644 --- a/utils/zsh/Makefile +++ b/utils/zsh/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=zsh -PKG_VERSION:=5.6.2 -PKG_RELEASE:=3 +PKG_VERSION:=5.7.1 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@SF/zsh -PKG_HASH:=a50bd66c0557e8eca3b8fa24e85d0de533e775d7a22df042da90488623752e9e +PKG_HASH:=7260292c2c1d483b2d50febfa5055176bd512b32a8833b116177bf5f01e77ee8 PKG_MAINTAINER:=Vadim A. Misbakh-Soloviov <openwrt-zsh@mva.name> PKG_LICENSE:=ZSH @@ -47,7 +47,6 @@ define Build/Configure $(call Build/Configure/Default, \ --disable-etcdir \ --disable-gdbm \ - --disable-dynamic \ $(if $(CONFIG_USE_MUSL),--enable-libc-musl) \ --enable-pcre \ --enable-cap \ @@ -83,8 +82,8 @@ define Build/Configure $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" prep endef -TARGET_CFLAGS += -ffunction-sections -fdata-sections -flto -TARGET_LDFLAGS += -Wl,--gc-sections -flto +TARGET_CFLAGS += $(FPIC) -ffunction-sections -fdata-sections -flto +TARGET_LDFLAGS += $(FPIC) -Wl,--gc-sections -flto define Package/zsh/postinst #!/bin/sh @@ -101,14 +100,21 @@ define Package/zsh/install $(INSTALL_DIR) $(1)/bin $(INSTALL_DIR) $(1)/$(CONFIGURE_PREFIX)/bin $(INSTALL_DIR) $(1)/$(CONFIGURE_PREFIX)/share/zsh/$(PKG_VERSION) + $(INSTALL_DIR) $(1)/$(CONFIGURE_PREFIX)/lib/zsh/$(PKG_VERSION)/zsh + $(INSTALL_DIR) $(1)/$(CONFIGURE_PREFIX)/lib/zsh/$(PKG_VERSION)/zsh/net + $(INSTALL_DIR) $(1)/$(CONFIGURE_PREFIX)/lib/zsh/$(PKG_VERSION)/zsh/param $(INSTALL_BIN) $(PKG_INSTALL_DIR)/$(CONFIGURE_PREFIX)/bin/zsh $(1)/$(CONFIGURE_PREFIX)/bin/ $(CP) $(PKG_INSTALL_DIR)/$(CONFIGURE_PREFIX)/share/zsh/$(PKG_VERSION)/* $(1)/$(CONFIGURE_PREFIX)/share/zsh/$(PKG_VERSION)/ + $(CP) $(PKG_INSTALL_DIR)/$(CONFIGURE_PREFIX)/lib/zsh/$(PKG_VERSION)/zsh/* $(1)/$(CONFIGURE_PREFIX)/lib/zsh/$(PKG_VERSION)/zsh/ + $(CP) $(PKG_INSTALL_DIR)/$(CONFIGURE_PREFIX)/lib/zsh/$(PKG_VERSION)/zsh/net/* $(1)/$(CONFIGURE_PREFIX)/lib/zsh/$(PKG_VERSION)/zsh/net/ + $(CP) $(PKG_INSTALL_DIR)/$(CONFIGURE_PREFIX)/lib/zsh/$(PKG_VERSION)/zsh/param/* $(1)/$(CONFIGURE_PREFIX)/lib/zsh/$(PKG_VERSION)/zsh/param/ endef define Package/zsh/postrm #!/bin/sh -rm -rf "$${IPKG_INSTROOT}/$(CONFIGURE_PREFIX)/share/zsh/$(PKG_VERSION)" +rm -rf "$${IPKG_INSTROOT}/$(CONFIGURE_PREFIX)/share/zsh/$(PKG_VERSION)" \ + "$${IPKG_INSTROOT}/$(CONFIGURE_PREFIX)/lib/zsh/$(PKG_VERSION)" endef $(eval $(call BuildPackage,zsh)) |