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 56469138334 for ; Thu, 19 Jul 2018 02:19:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2591BE095E; Thu, 19 Jul 2018 02:19:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EDA45E095E for ; Thu, 19 Jul 2018 02:19:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 DA483335C6B for ; Thu, 19 Jul 2018 02:19:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 415D636B for ; Thu, 19 Jul 2018 02:19:43 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1531966718.4ba06b5ba1fef6cbd2d1c120f84b09c06932a13f.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-shells/fish/, app-shells/fish/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-shells/fish/files/fish-2.7.1-fix-printf-o-handling-on-ppc.patch app-shells/fish/fish-2.7.1.ebuild X-VCS-Directories: app-shells/fish/ app-shells/fish/files/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: 4ba06b5ba1fef6cbd2d1c120f84b09c06932a13f X-VCS-Branch: master Date: Thu, 19 Jul 2018 02:19:43 +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: bc808cb4-f87d-4418-8802-0bb109d829a2 X-Archives-Hash: 2bbc1e656123d26404e43e837d49847d commit: 4ba06b5ba1fef6cbd2d1c120f84b09c06932a13f Author: Georgy Yakovlev gentoo org> AuthorDate: Thu Jul 19 02:18:38 2018 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Thu Jul 19 02:18:38 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ba06b5b app-shells/fish: fix 'printf "%o"' handling on ppc Backport as a patch, that is already upstream https://github.com/fish-shell/fish-shell/pull/4444 Run tests with -j1 and be verbose Run tests only if fish is already installed Reported-by: Sergei Trofimovich gentoo.org> Bug: https://bugs.gentoo.org/656246 Package-Manager: Portage-2.3.43, Repoman-2.3.10 .../fish/files/fish-2.7.1-fix-printf-o-handling-on-ppc.patch | 12 ++++++++++++ app-shells/fish/fish-2.7.1.ebuild | 8 +++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/app-shells/fish/files/fish-2.7.1-fix-printf-o-handling-on-ppc.patch b/app-shells/fish/files/fish-2.7.1-fix-printf-o-handling-on-ppc.patch new file mode 100644 index 00000000000..4d3d79ae6a5 --- /dev/null +++ b/app-shells/fish/files/fish-2.7.1-fix-printf-o-handling-on-ppc.patch @@ -0,0 +1,12 @@ +diff --git a/src/builtin_printf.cpp b/src/builtin_printf.cpp +index 8595120d5..24cf9a9e1 100644 +--- a/src/builtin_printf.cpp ++++ b/src/builtin_printf.cpp +@@ -444,6 +444,7 @@ void builtin_printf_state_t::print_direc(const wchar_t *start, size_t length, wc + case L'X': + case L'd': + case L'i': ++ case L'o': + case L'u': { + fmt.append(L"ll"); + break; diff --git a/app-shells/fish/fish-2.7.1.ebuild b/app-shells/fish/fish-2.7.1.ebuild index 657ee7b3e84..06afa49de51 100644 --- a/app-shells/fish/fish-2.7.1.ebuild +++ b/app-shells/fish/fish-2.7.1.ebuild @@ -27,6 +27,8 @@ DEPEND=" test? ( dev-tcltk/expect ) " +PATCHES=( "${FILESDIR}/${P}-fix-printf-o-handling-on-ppc.patch" ) + S="${WORKDIR}/${MY_P}" src_configure() { @@ -48,7 +50,11 @@ src_install() { } src_test() { - emake V=1 test + if has_version ~${CATEGORY}/${P} ; then + emake -j1 V=1 SHOW_INTERACTIVE_LOG=1 test + else + ewarn "Some tests only work when the package is already installed" + fi } pkg_postinst() {