diff options
| author |   Mart Raudsepp <leio@gentoo.org> | 2019-02-15 21:21:06 +0200 |
|---|---|---|
| committer | Mart Raudsepp <leio@gentoo.org> | 2019-02-15 21:21:33 +0200 |
| commit | a84897e9ae37ed3c3c3a74e7c0346e1f68049faf (patch) | |
| tree | 7a26d15436acdc83f706e1a2661e3a885b3aec94 /app-misc/tracker-miners | |
| parent | gnome-extra/nemo: bump to 4.0.6, add tracker-2 compatibility (diff) | |
| download | gentoo-a84897e9ae37ed3c3c3a74e7c0346e1f68049faf.tar.gz gentoo-a84897e9ae37ed3c3c3a74e7c0346e1f68049faf.tar.bz2 gentoo-a84897e9ae37ed3c3c3a74e7c0346e1f68049faf.zip | |
app-misc/tracker-miners: fix build for architectures without seccomp
Closes: https://bugs.gentoo.org/645828
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio@gentoo.org>
Diffstat (limited to 'app-misc/tracker-miners')
| -rw-r--r-- | app-misc/tracker-miners/files/2.1.5-seccomp.patch | 42 | ||||
| -rw-r--r-- | app-misc/tracker-miners/tracker-miners-2.1.5.ebuild | 1 |
2 files changed, 43 insertions, 0 deletions
diff --git a/app-misc/tracker-miners/files/2.1.5-seccomp.patch b/app-misc/tracker-miners/files/2.1.5-seccomp.patch new file mode 100644 index 000000000000..f32d698a4873 --- /dev/null +++ b/app-misc/tracker-miners/files/2.1.5-seccomp.patch @@ -0,0 +1,42 @@ +From b2d4b05a0c9e34b88aaf55b9f52497b07af8e862 Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp <leio@gentoo.org> +Date: Fri, 15 Feb 2019 21:11:29 +0200 +Subject: [PATCH] build: Only require seccomp when the CPU architecture + supports it + +--- + meson.build | 18 +++++++++++++++++- + 1 file changed, 17 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index ef48e77a6..65ad19cad 100644 +--- a/meson.build ++++ b/meson.build +@@ -261,7 +261,23 @@ endif + # Check for libseccomp + ################################################################## + +-if not libseccomp.found() and host_machine.system() == 'linux' ++host_system = host_machine.system() ++host_cpu = host_machine.cpu() ++unsupported_cpus = [ ++ 'alpha', ++ 'ia64', ++ 'm68k', ++ 'parisc', ++ 'parisc64', ++ 'sh4', ++ 'sparc', ++ 'sparc64', ++] ++system_supports_seccomp = host_system == 'linux' ++cpu_supports_seccomp = not unsupported_cpus.contains(host_cpu) ++seccomp_required = system_supports_seccomp and cpu_supports_seccomp ++ ++if not libseccomp.found() and seccomp_required + error('Libseccomp is mandatory for sandboxed metadata extraction') + endif + +-- +2.17.0 + diff --git a/app-misc/tracker-miners/tracker-miners-2.1.5.ebuild b/app-misc/tracker-miners/tracker-miners-2.1.5.ebuild index 5cc68f9af1b4..92999f830e52 100644 --- a/app-misc/tracker-miners/tracker-miners-2.1.5.ebuild +++ b/app-misc/tracker-miners/tracker-miners-2.1.5.ebuild @@ -69,6 +69,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}"/${PV}-meson-fixes.patch # https://gitlab.gnome.org/GNOME/tracker-miners/merge_requests/49 "${FILESDIR}"/${PV}-test-fix.patch # https://gitlab.gnome.org/GNOME/tracker-miners/merge_requests/50 + "${FILESDIR}"/${PV}-seccomp.patch # https://gitlab.gnome.org/GNOME/tracker-miners/merge_requests/51 ) pkg_setup() { |