Skip to content

Commit

Permalink
zsh: include pcre and cap libraries (#6021)
Browse files Browse the repository at this point in the history
* zsh: include pcre and cap libraries (#6014)
* remove libcap dependency for unsupported archs
  • Loading branch information
hgy59 authored Mar 1, 2024
1 parent e5836de commit 9fa9ab0
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 5 deletions.
13 changes: 11 additions & 2 deletions cross/zsh/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,23 @@ PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://www.zsh.org/pub
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

DEPENDS = cross/ncursesw cross/gdbm
DEPENDS = cross/ncursesw cross/gdbm cross/pcre
OPTIONAL_DEPENDS = cross/libcap

HOMEPAGE = https://www.zsh.org/
COMMENT = Zsh is a shell designed for interactive use, although it is also a powerful scripting language.
LICENSE = Custom

GNU_CONFIGURE = 1
CONFIGURE_ARGS = --enable-gdbm
CONFIGURE_ARGS = --enable-gdbm
CONFIGURE_ARGS += --enable-pcre

include ../../mk/spksrc.archs.mk

ifneq ($(findstring $(ARCH),$(OLD_PPC_ARCHS) $(ARMv5_ARCHS)),$(ARCH))
DEPENDS += cross/libcap
CONFIGURE_ARGS += --enable-cap
endif

PRE_COMPILE_TARGET = zsh_pre_compile

Expand Down
2 changes: 1 addition & 1 deletion spk/zsh-static/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
SPK_NAME = zsh-static
SPK_CONFLICT = zsh
SPK_REV = 9
SPK_REV = 10

export ZSH_STATIC_MODULES=true

Expand Down
4 changes: 2 additions & 2 deletions spk/zsh/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ SPK_VERS = 5.9
SPK_CONFLICT ?= zsh-static
# Allow overriding the revision, used by spk/zsh-static.
# If you rev here, please also rev spk/zsh-static.
SPK_REV ?= 13
SPK_REV ?= 14
SPK_ICON = ../zsh/src/zsh.png

DEPENDS = cross/zsh
Expand All @@ -16,7 +16,7 @@ DESCRIPTION_GER = Die Z shell \(zsh\) ist eine Unix-Shell, die sowohl als intera
DESCRIPTION_ITA = La Z shell \(zsh\) è una shell che può essere utilizzata come linea di comando interattiva e come un potente interprete per script di shell. Zsh può essere vista come un\'estensione della Bourne shell dotata di numerose migliorie, fra le quali alcune caratteristiche mutuate da bash, ksh e tcsh.
DISPLAY_NAME = Z shell
STARTABLE = no
CHANGELOG = "Update to v5.9. For incompatiblities with former version please read the <a target=\"_blank\" href=\"https://zsh.sourceforge.io/releases.html\">release notes</a>."
CHANGELOG = "1. Update to v5.9. For incompatiblities with former version please read the <a target=\"_blank\" href=\"https://zsh.sourceforge.io/releases.html\">release notes</a>.<br/>2. Include pcre library.<br/>3. Include cap (linux capabilities) library for supported archs."

HOMEPAGE = https://www.zsh.org
LICENSE = Custom
Expand Down

0 comments on commit 9fa9ab0

Please sign in to comment.