commit: 9433975dc4e373168c535e1d65d0b1a7c8429ac9 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> AuthorDate: Wed Jun 2 21:08:15 2021 +0000 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> 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 <gyakovlev <AT> 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 <[email protected]> +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 <[email protected]> +--- + 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() {
