diff options
author | Joel Stanley <joel@jms.id.au> | 2019-04-01 10:42:49 +1030 |
---|---|---|
committer | Joel Stanley <joel@jms.id.au> | 2019-04-01 10:43:00 +1030 |
commit | b5542e1abd3d92012a384b3676eceea7248a4569 (patch) | |
tree | a496c29803d874fdb2ea3de1bea3188758e3f94c /package/libseccomp/0001-remove-static.patch | |
parent | 4ffa9554af5462c2db90300c7597cb6fa51f2d8f (diff) | |
parent | 863761ff3c6233e6e2ef836c4600590dc0d38197 (diff) | |
download | buildroot-b5542e1abd3d92012a384b3676eceea7248a4569.tar.gz buildroot-b5542e1abd3d92012a384b3676eceea7248a4569.zip |
Merge tag '2019.02.1' into 2019.02-op-build
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'package/libseccomp/0001-remove-static.patch')
-rw-r--r-- | package/libseccomp/0001-remove-static.patch | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/package/libseccomp/0001-remove-static.patch b/package/libseccomp/0001-remove-static.patch index 9f0ac210c7..60a1ff00b6 100644 --- a/package/libseccomp/0001-remove-static.patch +++ b/package/libseccomp/0001-remove-static.patch @@ -1,4 +1,4 @@ -From 8632287cf6863b580340f846ac14adf2609abdb0 Mon Sep 17 00:00:00 2001 +From 5d010fb06eae43b284e5ccc322f6de47eb42b751 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine <fontaine.fabrice@gmail.com> Date: Sat, 2 Jun 2018 13:45:22 +0200 Subject: [PATCH] remove static @@ -14,16 +14,18 @@ and slighly updated to work with 2.3.3 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> +[Peter: updated for v2.4.0 which adds scmp_api_level] +Signed-off-by: Peter Korsgaard <peter@korsgaard.com> --- - tools/Makefile.am | 2 -- - 1 file changed, 2 deletions(-) + tools/Makefile.am | 3 --- + 1 file changed, 3 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am -index 70b4aed..ef74270 100644 +index f768365..5f9d571 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am -@@ -35,8 +35,6 @@ scmp_bpf_disasm_SOURCES = scmp_bpf_disasm.c bpf.h util.h - scmp_bpf_sim_SOURCES = scmp_bpf_sim.c bpf.h util.h +@@ -37,10 +37,7 @@ scmp_bpf_sim_SOURCES = scmp_bpf_sim.c bpf.h util.h + scmp_api_level_SOURCES = scmp_api_level.c scmp_sys_resolver_LDADD = ../src/libseccomp.la -scmp_sys_resolver_LDFLAGS = -static @@ -31,6 +33,8 @@ index 70b4aed..ef74270 100644 -scmp_arch_detect_LDFLAGS = -static scmp_bpf_disasm_LDADD = util.la scmp_bpf_sim_LDADD = util.la + scmp_api_level_LDADD = ../src/libseccomp.la +-scmp_api_level_LDFLAGS = -static -- -2.14.1 +2.11.0 |