Skip to content

Commit

Permalink
gnome-desktop: Make seccomp dependency optional for rv32
Browse files Browse the repository at this point in the history
rv32 support in libseccomp is not yet upstream, therefore add rv32 to
seccomp unsupported architectures

Signed-off-by: Khem Raj <[email protected]>
  • Loading branch information
kraj committed Mar 4, 2023
1 parent 722f529 commit 049db79
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
From 6937685426aff8059b68b2941a0fe549eca21ce5 Mon Sep 17 00:00:00 2001
From: Khem Raj <[email protected]>
Date: Fri, 3 Mar 2023 23:04:56 -0800
Subject: [PATCH] meson: Add riscv32 to seccomp unsupported list

rv32 needs to upstream the libseccomp support

Upstream-Status: Pending
Signed-off-by: Khem Raj <[email protected]>
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 6a888b8..a87c419 100644
--- a/meson.build
+++ b/meson.build
@@ -65,7 +65,7 @@ udev_dep = dependency('libudev', required: get_option('udev'))
host_os = host_machine.system()
host_cpu = host_machine.cpu()
supported_os = ['linux']
-unsupported_cpus = ['alpha', 'ia64', 'm68k', 'sh4', 'sparc', 'sparc64']
+unsupported_cpus = ['alpha', 'ia64', 'm68k', 'riscv32', 'sh4', 'sparc', 'sparc64']
if supported_os.contains(host_os) and not unsupported_cpus.contains(host_cpu)
seccomp_dep = dependency('libseccomp')
else
--
2.39.2

5 changes: 4 additions & 1 deletion meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_43.bb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ REQUIRED_DISTRO_FEATURES += "gobject-introspection-data"

GIR_MESON_OPTION = ""

SRC_URI += "file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch"
SRC_URI += "file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \
file://0001-meson-Add-riscv32-to-seccomp-unsupported-list.patch"
SRC_URI[archive.sha256sum] = "3d6e153317486157596aa3802f87676414c570738f450a94a041fe8835420a69"

DEPENDS += " \
Expand All @@ -34,6 +35,8 @@ DEPENDS += " \
xrandr \
"

DEPENDS:remove:riscv32 = "libseccomp"

GTKDOC_MESON_OPTION = "gtk_doc"
EXTRA_OEMESON = "-Ddesktop_docs=false"

Expand Down

0 comments on commit 049db79

Please sign in to comment.