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 99ED61382C5 for ; Wed, 2 Jun 2021 21:14:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A87C3E087F; Wed, 2 Jun 2021 21:14:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 8D879E087F for ; Wed, 2 Jun 2021 21:14:04 +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 5FFE8340E4C for ; Wed, 2 Jun 2021 21:14:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CE20C79C for ; Wed, 2 Jun 2021 21:14:01 +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: <1622668332.9433975dc4e373168c535e1d65d0b1a7c8429ac9.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/, sys-apps/util-linux/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/util-linux/files/util-linux-2.37-ppc-nortas.patch sys-apps/util-linux/util-linux-2.37.ebuild X-VCS-Directories: sys-apps/util-linux/ sys-apps/util-linux/files/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: 9433975dc4e373168c535e1d65d0b1a7c8429ac9 X-VCS-Branch: master Date: Wed, 2 Jun 2021 21:14:01 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: da74d719-581e-48cb-92f5-0070a5ff523f X-Archives-Hash: f60a1f30abbe562b3c0ff3154ffac1b6 commit: 9433975dc4e373168c535e1d65d0b1a7c8429ac9 Author: Georgy Yakovlev gentoo org> AuthorDate: Wed Jun 2 21:08:15 2021 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Wed Jun 2 21:12:12 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9433975d sys-apps/util-linux: fix build on powerpc Package-Manager: Portage-3.0.19, Repoman-3.0.3 Signed-off-by: Georgy Yakovlev gentoo.org> .../files/util-linux-2.37-ppc-nortas.patch | 36 ++++++++++++++++++++++ sys-apps/util-linux/util-linux-2.37.ebuild | 2 ++ 2 files changed, 38 insertions(+) diff --git a/sys-apps/util-linux/files/util-linux-2.37-ppc-nortas.patch b/sys-apps/util-linux/files/util-linux-2.37-ppc-nortas.patch new file mode 100644 index 00000000000..b3ac4716323 --- /dev/null +++ b/sys-apps/util-linux/files/util-linux-2.37-ppc-nortas.patch @@ -0,0 +1,36 @@ +From 45cd3aa4ded6df54dde85e6939b48bb273c8b6c3 Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev +Date: Wed, 2 Jun 2021 13:59:26 -0700 +Subject: [PATCH] lscpu: fix build on powerpc + +fails with error: label at end of compound statement +and fix typo as bonus. + +Signed-off-by: Georgy Yakovlev +--- + sys-utils/lscpu-cputype.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/sys-utils/lscpu-cputype.c b/sys-utils/lscpu-cputype.c +index cf7af361c..d5ca8e1f1 100644 +--- a/sys-utils/lscpu-cputype.c ++++ b/sys-utils/lscpu-cputype.c +@@ -724,7 +724,7 @@ int lscpu_read_archext(struct lscpu_cxt *cxt) + } + + #if defined(HAVE_LIBRTAS) +- /* Get PowerPC speficic info */ ++ /* Get PowerPC specific info */ + if (!cxt->noalive) { + int rc, len, ntypes; + +@@ -745,8 +745,8 @@ int lscpu_read_archext(struct lscpu_cxt *cxt) + ct->physsockets = strbe16toh(buf, 4); + ct->physchips = strbe16toh(buf, 6); + ct->physcoresperchip = strbe16toh(buf, 8); +-nortas: + } ++nortas: + #endif + return 0; + } diff --git a/sys-apps/util-linux/util-linux-2.37.ebuild b/sys-apps/util-linux/util-linux-2.37.ebuild index 66a36a6cd0c..2b3ff76f988 100644 --- a/sys-apps/util-linux/util-linux-2.37.ebuild +++ b/sys-apps/util-linux/util-linux-2.37.ebuild @@ -88,6 +88,8 @@ RESTRICT="!test? ( test )" S="${WORKDIR}/${MY_P}" PATCHES=( + # https://github.com/karelzak/util-linux/pull/1329 + "${FILESDIR}/${P}-ppc-nortas.patch" ) rm_man() {