From 3d18c9bc4858366541ee5e33497292dfebf3f35a55a88183e809c2afe62bf678 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 29 Mar 2015 00:57:22 +0000 Subject: [PATCH] Add 0001-build-resolve-build-failure-due-to-lacking-includes.patch OBS-URL: https://build.opensuse.org/package/show/security/libseccomp?expand=0&rev=27 --- ...uild-failure-due-to-lacking-includes.patch | 33 +++++++++++++++++++ libseccomp.changes | 1 + libseccomp.spec | 5 +-- 3 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 0001-build-resolve-build-failure-due-to-lacking-includes.patch diff --git a/0001-build-resolve-build-failure-due-to-lacking-includes.patch b/0001-build-resolve-build-failure-due-to-lacking-includes.patch new file mode 100644 index 0000000..78fd78c --- /dev/null +++ b/0001-build-resolve-build-failure-due-to-lacking-includes.patch @@ -0,0 +1,33 @@ +From 0dad79efa5b4538d6e5ee19cacd8909a0d6e23de Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +Date: Sun, 29 Mar 2015 01:52:31 +0100 +Subject: [PATCH] build: resolve build failure due to lacking includes +Upstream: sent + +If /usr/include/linux/elf-em.h is sufficiently old and only +/usr/include/elf.h (from glibc) has EM_ARM, the build fails +in tools/. This is because elf.h is not included :( + +In file included from scmp_bpf_disasm.c:30:0: +scmp_bpf_disasm.c: In function 'main': +scmp_bpf_disasm.c:322:12: error: 'EM_ARM' undeclared (first use in this function) + arch = AUDIT_ARCH_ARM; +--- + tools/util.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tools/util.h b/tools/util.h +index 13ef59f..09fe507 100644 +--- a/tools/util.h ++++ b/tools/util.h +@@ -24,6 +24,7 @@ + + #include + #include ++#include + + #ifndef __AUDIT_ARCH_CONVENTION_MIPS64_N32 + #define __AUDIT_ARCH_CONVENTION_MIPS64_N32 0x20000000 +-- +2.1.4 + diff --git a/libseccomp.changes b/libseccomp.changes index ec57e7b..6978b39 100644 --- a/libseccomp.changes +++ b/libseccomp.changes @@ -8,6 +8,7 @@ Sun Mar 29 00:28:59 UTC 2015 - jengelh@inai.de * Added Python bindings - Remove 0001-build-use-autotools-as-build-system.patch (merged). Add no-static.diff. + Add 0001-build-resolve-build-failure-due-to-lacking-includes.patch ------------------------------------------------------------------- Sat Jul 12 11:26:10 UTC 2014 - meissner@suse.com diff --git a/libseccomp.spec b/libseccomp.spec index fffce89..0442130 100644 --- a/libseccomp.spec +++ b/libseccomp.spec @@ -29,7 +29,8 @@ Url: http://github.com/seccomp Source: https://github.com/seccomp/libseccomp/releases/download/v%version/%name-%version.tar.gz Source2: https://github.com/seccomp/libseccomp/releases/download/v%version/%name-%version.tar.gz.SHA256SUM.asc Patch1: no-static.diff -Patch2: libseccomp-s390x-support.patch +Patch2: 0001-build-resolve-build-failure-due-to-lacking-includes.patch +Patch3: libseccomp-s390x-support.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake >= 1.11 @@ -97,7 +98,7 @@ This subpackage contains debug utilities for the seccomp interface. %prep %setup -q -%patch -P 1 -P 2 -p1 +%patch -P 1 -P 2 -P 3 -p1 %build autoreconf -fi