diff options
| author |   Matoro Mahri <matoro_gentoo@matoro.tk> | 2023-12-28 19:40:35 -0500 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2023-12-29 01:02:02 +0000 |
| commit | 29e215dd7507b012a4111610f2157b744dc1e385 (patch) | |
| tree | 33ffafad53e10d4579bd98c91b3769f133f9b3e4 /sys-apps/util-linux | |
| parent | app-emulation/qemu: add 8.1.4 (diff) | |
| download | gentoo-29e215dd7507b012a4111610f2157b744dc1e385.tar.gz gentoo-29e215dd7507b012a4111610f2157b744dc1e385.tar.bz2 gentoo-29e215dd7507b012a4111610f2157b744dc1e385.zip | |
sys-apps/util-linux: backport patch to build tests on hppa
See: https://github.com/util-linux/util-linux/commit/1d4456dd81a64a73685df9e5f1232d566818e453
Closes: https://bugs.gentoo.org/920904
Signed-off-by: Matoro Mahri <matoro_gentoo@matoro.tk>
Closes: https://github.com/gentoo/gentoo/pull/34526
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sys-apps/util-linux')
| -rw-r--r-- | sys-apps/util-linux/files/util-linux-2.39.2-backport-1d4456d.patch | 33 | ||||
| -rw-r--r-- | sys-apps/util-linux/util-linux-2.39.2-r1.ebuild | 1 | ||||
| -rw-r--r-- | sys-apps/util-linux/util-linux-2.39.3-r1.ebuild | 1 |
3 files changed, 35 insertions, 0 deletions
diff --git a/sys-apps/util-linux/files/util-linux-2.39.2-backport-1d4456d.patch b/sys-apps/util-linux/files/util-linux-2.39.2-backport-1d4456d.patch new file mode 100644 index 000000000000..3cce0bcab453 --- /dev/null +++ b/sys-apps/util-linux/files/util-linux-2.39.2-backport-1d4456d.patch @@ -0,0 +1,33 @@ +https://bugs.gentoo.org/920904 +https://github.com/util-linux/util-linux/commit/1d4456dd81a64a73685df9e5f1232d566818e453 + +From 1d4456dd81a64a73685df9e5f1232d566818e453 Mon Sep 17 00:00:00 2001 +From: John David Anglin <dave@parisc-linux.org> +Date: Mon, 7 Aug 2023 15:37:17 +0000 +Subject: [PATCH] enosys: fix build on hppa + +The following patch fixes the definition of SECCOMP_ARCH_NATIVE +on hppa. + +Signed-off-by: John David Anglin <dave.anglin@bell.net> +--- + include/audit-arch.h | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/include/audit-arch.h b/include/audit-arch.h +index 63d9eb52c1..f1354eec5d 100644 +--- a/include/audit-arch.h ++++ b/include/audit-arch.h +@@ -57,6 +57,12 @@ + # else + # define SECCOMP_ARCH_NATIVE AUDIT_ARCH_LOONGARCH64 + # endif ++#elif __hppa__ ++# if __SIZEOF_POINTER__ == 4 ++# define SECCOMP_ARCH_NATIVE AUDIT_ARCH_PARISC ++# else ++# define SECCOMP_ARCH_NATIVE AUDIT_ARCH_PARISC64 ++# endif + #else + # error Unknown target architecture + #endif diff --git a/sys-apps/util-linux/util-linux-2.39.2-r1.ebuild b/sys-apps/util-linux/util-linux-2.39.2-r1.ebuild index f6d9af3560cd..28556848e5cd 100644 --- a/sys-apps/util-linux/util-linux-2.39.2-r1.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.2-r1.ebuild @@ -100,6 +100,7 @@ RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}"/${PN}-2.39.2-fincore-test.patch "${FILESDIR}"/${PN}-2.39.2-backport-pr2251.patch + "${FILESDIR}"/${PN}-2.39.2-backport-1d4456d.patch ) pkg_pretend() { diff --git a/sys-apps/util-linux/util-linux-2.39.3-r1.ebuild b/sys-apps/util-linux/util-linux-2.39.3-r1.ebuild index dd2902dbc1f1..85b01bb6d900 100644 --- a/sys-apps/util-linux/util-linux-2.39.3-r1.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.3-r1.ebuild @@ -100,6 +100,7 @@ RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}"/${PN}-2.39.2-fincore-test.patch "${FILESDIR}"/${PN}-2.39.2-backport-pr2251.patch + "${FILESDIR}"/${PN}-2.39.2-backport-1d4456d.patch ) pkg_pretend() { |