diff options
author | Mike Gilbert <floppym@gentoo.org> | 2016-11-13 15:36:46 -0500 |
---|---|---|
committer | Mike Gilbert <floppym@gentoo.org> | 2016-11-13 15:41:07 -0500 |
commit | f63eff117b81a6703e670bd65596d1f7d843ca0c (patch) | |
tree | a2a640e549023d39fb894c50c0be16a99df1d79d /app-admin/apache-tools | |
parent | Remove non-DIST entries from Manifests (diff) | |
download | gentoo-f63eff117b81a6703e670bd65596d1f7d843ca0c.tar.gz gentoo-f63eff117b81a6703e670bd65596d1f7d843ca0c.tar.bz2 gentoo-f63eff117b81a6703e670bd65596d1f7d843ca0c.zip |
app-admin/apache-tools: fix pcre-config wrapper script
Thanks to Robert Förster for noticing the error.
Bug: https://bugs.gentoo.org/597868
Package-Manager: portage-2.3.2_p5
Diffstat (limited to 'app-admin/apache-tools')
-rw-r--r-- | app-admin/apache-tools/apache-tools-2.4.20.ebuild | 13 | ||||
-rw-r--r-- | app-admin/apache-tools/apache-tools-2.4.23.ebuild | 13 |
2 files changed, 20 insertions, 6 deletions
diff --git a/app-admin/apache-tools/apache-tools-2.4.20.ebuild b/app-admin/apache-tools/apache-tools-2.4.20.ebuild index 574e9a80bc82..c39a87e9d435 100644 --- a/app-admin/apache-tools/apache-tools-2.4.20.ebuild +++ b/app-admin/apache-tools/apache-tools-2.4.20.ebuild @@ -39,9 +39,16 @@ src_prepare() { # This package really should upgrade to using pcre's .pc file. cat <<-\EOF >"${T}"/pcre-config - #!/bin/sh - [ "${flag}" = "--version" ] && set -- --modversion - exec ${PKG_CONFIG} libpcre "$@" + #!/bin/bash + flags=() + for flag; do + if [[ ${flag} == "--version" ]]; then + flags+=( --modversion ) + else + flags+=( "${flag}" ) + fi + done + exec ${PKG_CONFIG} libpcre "${flags[@]}" EOF chmod a+x "${T}"/pcre-config } diff --git a/app-admin/apache-tools/apache-tools-2.4.23.ebuild b/app-admin/apache-tools/apache-tools-2.4.23.ebuild index b0a673ddcd4d..e52b5cf954ad 100644 --- a/app-admin/apache-tools/apache-tools-2.4.23.ebuild +++ b/app-admin/apache-tools/apache-tools-2.4.23.ebuild @@ -39,9 +39,16 @@ src_prepare() { # This package really should upgrade to using pcre's .pc file. cat <<-\EOF >"${T}"/pcre-config - #!/bin/sh - [ "${flag}" = "--version" ] && set -- --modversion - exec ${PKG_CONFIG} libpcre "$@" + #!/bin/bash + flags=() + for flag; do + if [[ ${flag} == "--version" ]]; then + flags+=( --modversion ) + else + flags+=( "${flag}" ) + fi + done + exec ${PKG_CONFIG} libpcre "${flags[@]}" EOF chmod a+x "${T}"/pcre-config } |