[openwrt/openwrt] util-linux: Fix build on powerpc and arc

LEDE Commits lede-commits at lists.infradead.org
Fri May 19 02:58:15 PDT 2023


hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/a665c8e5bd31df6db232ceb4df8bc77481fc1413

commit a665c8e5bd31df6db232ceb4df8bc77481fc1413
Author: Hauke Mehrtens <hauke at hauke-m.de>
AuthorDate: Thu May 18 19:29:18 2023 +0200

    util-linux: Fix build on powerpc and arc
    
    This fixes the build of util-linux on powerpc and arc. Both CPU
    architectures were not supported here in addition to the missing MIPS
    support.
    
    Fixes: 628a410ed149 ("util-linux: update to 2.39")
    Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
---
 .../0001-test_enosys-add-support-for-mips.patch        | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/package/utils/util-linux/patches/0001-test_enosys-add-support-for-mips.patch b/package/utils/util-linux/patches/0001-test_enosys-add-support-for-mips.patch
index 602ffe67e7..f8c8f851ec 100644
--- a/package/utils/util-linux/patches/0001-test_enosys-add-support-for-mips.patch
+++ b/package/utils/util-linux/patches/0001-test_enosys-add-support-for-mips.patch
@@ -1,24 +1,36 @@
 From 2558932c65524d953e4c86d7fda2282a582aa5ec Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <thomas at t-8ch.de>
 Date: Wed, 17 May 2023 16:50:47 +0200
-Subject: [PATCH] test_enosys: add support for mips
+Subject: [PATCH] test_enosys: add support for mips, powerpc and arc
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
 Signed-off-by: Thomas Weißschuh <thomas at t-8ch.de>
 ---
- tests/helpers/test_enosys.c | 2 ++
+ tests/helpers/test_enosys.c | 14 ++
  1 file changed, 2 insertions(+)
 
 --- a/tests/helpers/test_enosys.c
 +++ b/tests/helpers/test_enosys.c
-@@ -53,6 +53,8 @@
+@@ -53,6 +53,20 @@
  #    else
  # 	 define SECCOMP_ARCH_NATIVE AUDIT_ARCH_PPC64LE
  #    endif
++#elif __powerpc__
++# 	 define SECCOMP_ARCH_NATIVE AUDIT_ARCH_PPC
 +#elif __mips__
++#    if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
 +# 	 define SECCOMP_ARCH_NATIVE AUDIT_ARCH_MIPS
++#    else
++# 	 define SECCOMP_ARCH_NATIVE AUDIT_ARCH_MIPSEL
++#    endif
++#elif __arc__
++#    if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
++# 	 define SECCOMP_ARCH_NATIVE AUDIT_ARCH_ARCV2BE
++#    else
++# 	 define SECCOMP_ARCH_NATIVE AUDIT_ARCH_ARCV2
++#    endif
  #else
  #    error Unknown target architecture
  #endif




More information about the lede-commits mailing list