diff options
| author | Baruch Siach <baruch@tkos.co.il> | 2016-03-03 23:46:10 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-03-06 21:38:04 +0100 |
| commit | b904c090bdf1ec54648d0cef7a0e66024e4816c8 (patch) | |
| tree | fc3a5d84c1f234bed5a6723f4c7b9f56acf37c91 /package/zsh | |
| parent | 184431c335b1f8e874e687afad32b1a0b2314038 (diff) | |
zsh: don't use host pcre-config
Commit 5e05faec7b4 (zsh: use the correct target pcre-config) set
ac_cv_prog_PCRECONF to the location of staging pcre-config. Unfortunately zsh
configure script does not actually use this variable when running pcre-config.
Complete the fix with a patch that makes use of ac_cv_prog_PCRECONF.
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/zsh')
| -rw-r--r-- | package/zsh/0001-configure-use-user-set-pcre-config.patch | 33 | ||||
| -rw-r--r-- | package/zsh/zsh.mk | 2 |
2 files changed, 35 insertions, 0 deletions
diff --git a/package/zsh/0001-configure-use-user-set-pcre-config.patch b/package/zsh/0001-configure-use-user-set-pcre-config.patch new file mode 100644 index 000000000..d4cf59bdd --- /dev/null +++ b/package/zsh/0001-configure-use-user-set-pcre-config.patch @@ -0,0 +1,33 @@ +From: Baruch Siach <baruch@tkos.co.il> +Date: Thu, 3 Mar 2016 23:14:39 +0200 +Subject: [PATCH] configure: use user set pcre-config + +Setting a non default configuration script location is common practice when +cross compiling, since the target library might need different flags. zsh +configure scripts allows the user to set pcre-config location but doesn't +actually use it. Fix this. + +Signed-off-by: Baruch Siach <baruch@tkos.co.il> +--- +Patch status: sent upstream +(http://www.zsh.org/mla/workers/2016/msg00619.html) + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index c3bd713c126a..9947b16066b6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -925,7 +925,7 @@ fi + if test x$enable_pcre = xyes; then + dnl pcre-config should probably be employed here + dnl AC_SEARCH_LIBS(pcre_compile, pcre) +- LIBS="`pcre-config --libs` $LIBS" ++ LIBS="`$ac_cv_prog_PCRECONF --libs` $LIBS" + fi + + dnl --------------------- +-- +2.7.0 + diff --git a/package/zsh/zsh.mk b/package/zsh/zsh.mk index 84dbbde56..aa4029f1a 100644 --- a/package/zsh/zsh.mk +++ b/package/zsh/zsh.mk @@ -9,6 +9,8 @@ ZSH_SITE = http://www.zsh.org/pub ZSH_SOURCE = zsh-$(ZSH_VERSION).tar.xz ZSH_DEPENDENCIES = ncurses ZSH_CONF_OPTS = --bindir=/bin +# Patching configure.ac +ZSH_AUTORECONF = YES ZSH_LICENSE = MIT-like ZSH_LICENSE_FILES = LICENCE |