summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/libcap/files
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2020-12-23 10:23:25 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-12-24 08:25:14 +0000
commitec66008643bdd18d62f626da680774bfe3292220 (patch)
tree21ce71023657ce29630b6ac7b25cd538404343f5 /meta/recipes-support/libcap/files
parent1d3e7c7832a5638cea38bc913c7df3f90c15db94 (diff)
downloadpoky-ec66008643bdd18d62f626da680774bfe3292220.tar.gz
libcap: update 2.45 -> 2.46
Rebase 0001-tests-do-not-statically-link-a-test.patch (From OE-Core rev: 86d657364bb2ed859ed7151d56cca431104d8279) Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/libcap/files')
-rw-r--r--meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch10
1 files changed, 6 insertions, 4 deletions
diff --git a/meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch b/meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch
index 3c737b884e..d2653afb75 100644
--- a/meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch
+++ b/meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch
@@ -1,4 +1,4 @@
1From c22c6c16362c7dbc8d6faea06edee5e07759c5fa Mon Sep 17 00:00:00 2001 1From 6aa15fe548e5b1d6ca3b373779beb7521ea95ba9 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 15 Jan 2020 17:16:28 +0100 3Date: Wed, 15 Jan 2020 17:16:28 +0100
4Subject: [PATCH] tests: do not statically link a test 4Subject: [PATCH] tests: do not statically link a test
@@ -7,7 +7,6 @@ This fails on e.g. centos 7
7 7
8Upstream-Status: Inappropriate [oe-core specific] 8Upstream-Status: Inappropriate [oe-core specific]
9Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 9Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
10
11--- 10---
12 progs/Makefile | 2 +- 11 progs/Makefile | 2 +-
13 tests/Makefile | 4 ++-- 12 tests/Makefile | 4 ++--
@@ -27,7 +26,7 @@ index 1d7fc7a..37db8f7 100644
27 sudotest: test tcapsh-static 26 sudotest: test tcapsh-static
28 sudo $(LDPATH) ./quicktest.sh 27 sudo $(LDPATH) ./quicktest.sh
29diff --git a/tests/Makefile b/tests/Makefile 28diff --git a/tests/Makefile b/tests/Makefile
30index 3431df9..727fb86 100644 29index 01f7589..094ec57 100644
31--- a/tests/Makefile 30--- a/tests/Makefile
32+++ b/tests/Makefile 31+++ b/tests/Makefile
33@@ -22,7 +22,7 @@ ifeq ($(PTHREADS),yes) 32@@ -22,7 +22,7 @@ ifeq ($(PTHREADS),yes)
@@ -36,7 +35,7 @@ index 3431df9..727fb86 100644
36 else 35 else
37-LDFLAGS += --static 36-LDFLAGS += --static
38+LDFLAGS += 37+LDFLAGS +=
39 DEPS=../libcap/libcap.a ../progs/tcapsh-static 38 DEPS=../libcap/libcap.a
40 ifeq ($(PTHREADS),yes) 39 ifeq ($(PTHREADS),yes)
41 DEPS += ../libcap/libpsx.a 40 DEPS += ../libcap/libpsx.a
42@@ -106,7 +106,7 @@ noexploit: exploit.o $(DEPS) 41@@ -106,7 +106,7 @@ noexploit: exploit.o $(DEPS)
@@ -48,3 +47,6 @@ index 3431df9..727fb86 100644
48 47
49 clean: 48 clean:
50 rm -f psx_test libcap_psx_test libcap_launch_test *~ 49 rm -f psx_test libcap_psx_test libcap_launch_test *~
50--
512.17.1
52