diff options
| author |   Sebastian Pipping <sping@gentoo.org> | 2017-07-01 13:22:06 +0200 |
|---|---|---|
| committer | Sebastian Pipping <sping@gentoo.org> | 2017-07-01 13:22:39 +0200 |
| commit | ed776d4e8f2e1da38a6a058e615943b636a52176 (patch) | |
| tree | 2f09cb3badc7856585318e7702b69dfcda3d9f0e /dev-libs/expat | |
| parent | profiles: stable mask app-office/calligra:5[pim] (diff) | |
| download | gentoo-ed776d4e8f2e1da38a6a058e615943b636a52176.tar.gz gentoo-ed776d4e8f2e1da38a6a058e615943b636a52176.tar.bz2 gentoo-ed776d4e8f2e1da38a6a058e615943b636a52176.zip | |
dev-libs/expat: Fix compilation (bug #622360)
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Diffstat (limited to 'dev-libs/expat')
| -rw-r--r-- | dev-libs/expat/expat-2.2.1.ebuild | 1 | ||||
| -rw-r--r-- | dev-libs/expat/files/expat-2.2.1-gentoo-dash.patch | 31 |
2 files changed, 32 insertions, 0 deletions
diff --git a/dev-libs/expat/expat-2.2.1.ebuild b/dev-libs/expat/expat-2.2.1.ebuild index 97d901fc1110..7ada43d0dc16 100644 --- a/dev-libs/expat/expat-2.2.1.ebuild +++ b/dev-libs/expat/expat-2.2.1.ebuild @@ -20,6 +20,7 @@ DOCS=( AUTHORS Changes README ) src_prepare() { epatch "${FILESDIR}"/${P}-getrandom-detection.patch epatch "${FILESDIR}"/${P}-posix-shell.patch + epatch "${FILESDIR}"/${P}-gentoo-dash.patch # bug 622360 eapply_user eautoreconf } diff --git a/dev-libs/expat/files/expat-2.2.1-gentoo-dash.patch b/dev-libs/expat/files/expat-2.2.1-gentoo-dash.patch new file mode 100644 index 000000000000..a0eb60ce6cc0 --- /dev/null +++ b/dev-libs/expat/files/expat-2.2.1-gentoo-dash.patch @@ -0,0 +1,31 @@ +From 9502963fd2e84ac529950f3a6f4173d86b93b5d2 Mon Sep 17 00:00:00 2001 +From: Kerin Millar <kfm@plushkava.net> +Date: Thu, 29 Jun 2017 16:51:18 +0100 +Subject: [PATCH] conftools/get-version.sh: Use printf rather than try to infer + non-portable echo options + +--- + expat/conftools/get-version.sh | 13 +------------ + 1 file changed, 1 insertion(+), 12 deletions(-) + +diff --git a/expat/conftools/get-version.sh b/expat/conftools/get-version.sh +index a70e0fb..91e5c64 100755 +--- a/expat/conftools/get-version.sh ++++ b/expat/conftools/get-version.sh +@@ -32,15 +32,4 @@ MAJOR_VERSION="`sed -n -e '/MAJOR_VERSION/s/[^0-9]*//gp' $hdr`" + MINOR_VERSION="`sed -n -e '/MINOR_VERSION/s/[^0-9]*//gp' $hdr`" + MICRO_VERSION="`sed -n -e '/MICRO_VERSION/s/[^0-9]*//gp' $hdr`" + +-# Determine how to tell echo not to print the trailing \n. This is +-# similar to Autoconf's @ECHO_C@ and @ECHO_N@; however, we don't +-# generate this file via autoconf (in fact, get-version.sh is used +-# to *create* ./configure), so we just do something similar inline. +-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in +- *c*,-n*) ECHO_N= ECHO_C=' +-' ;; +- *c*,* ) ECHO_N=-n ECHO_C= ;; +- *) ECHO_N= ECHO_C='\c' ;; +-esac +- +-echo $ECHO_N "$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$ECHO_C" ++printf '%s.%s.%s' "$MAJOR_VERSION" "$MINOR_VERSION" "$MICRO_VERSION" |