From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9C3D2139694 for ; Sat, 1 Jul 2017 11:23:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1318D274022; Sat, 1 Jul 2017 11:23:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D51AA274022 for ; Sat, 1 Jul 2017 11:23:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1A0DC3416FE for ; Sat, 1 Jul 2017 11:23:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B7E887466 for ; Sat, 1 Jul 2017 11:23:46 +0000 (UTC) From: "Sebastian Pipping" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" Message-ID: <1498908159.ed776d4e8f2e1da38a6a058e615943b636a52176.sping@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/expat/, dev-libs/expat/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/expat/expat-2.2.1.ebuild dev-libs/expat/files/expat-2.2.1-gentoo-dash.patch X-VCS-Directories: dev-libs/expat/ dev-libs/expat/files/ X-VCS-Committer: sping X-VCS-Committer-Name: Sebastian Pipping X-VCS-Revision: ed776d4e8f2e1da38a6a058e615943b636a52176 X-VCS-Branch: master Date: Sat, 1 Jul 2017 11:23:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: acade1bb-44e8-4176-8260-542736f9c547 X-Archives-Hash: 12d45bf435caeea5973e1567bc4a6e8b commit: ed776d4e8f2e1da38a6a058e615943b636a52176 Author: Sebastian Pipping gentoo org> AuthorDate: Sat Jul 1 11:22:06 2017 +0000 Commit: Sebastian Pipping gentoo org> CommitDate: Sat Jul 1 11:22:39 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed776d4e dev-libs/expat: Fix compilation (bug #622360) Package-Manager: Portage-2.3.6, Repoman-2.3.2 dev-libs/expat/expat-2.2.1.ebuild | 1 + dev-libs/expat/files/expat-2.2.1-gentoo-dash.patch | 31 ++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/dev-libs/expat/expat-2.2.1.ebuild b/dev-libs/expat/expat-2.2.1.ebuild index 97d901fc111..7ada43d0dc1 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 00000000000..a0eb60ce6cc --- /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 +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"