summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch')
-rw-r--r--meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch52
1 files changed, 0 insertions, 52 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
deleted file mode 100644
index d2653afb75..0000000000
--- a/meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1From 6aa15fe548e5b1d6ca3b373779beb7521ea95ba9 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 15 Jan 2020 17:16:28 +0100
4Subject: [PATCH] tests: do not statically link a test
5
6This fails on e.g. centos 7
7
8Upstream-Status: Inappropriate [oe-core specific]
9Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
10---
11 progs/Makefile | 2 +-
12 tests/Makefile | 4 ++--
13 2 files changed, 3 insertions(+), 3 deletions(-)
14
15diff --git a/progs/Makefile b/progs/Makefile
16index 1d7fc7a..37db8f7 100644
17--- a/progs/Makefile
18+++ b/progs/Makefile
19@@ -42,7 +42,7 @@ endif
20 test: $(PROGS)
21
22 tcapsh-static: capsh.c $(DEPS)
23- $(CC) $(IPATH) $(CAPSH_SHELL) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS) --static
24+ $(CC) $(IPATH) $(CAPSH_SHELL) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS)
25
26 sudotest: test tcapsh-static
27 sudo $(LDPATH) ./quicktest.sh
28diff --git a/tests/Makefile b/tests/Makefile
29index 01f7589..094ec57 100644
30--- a/tests/Makefile
31+++ b/tests/Makefile
32@@ -22,7 +22,7 @@ ifeq ($(PTHREADS),yes)
33 DEPS += ../libcap/libpsx.so
34 endif
35 else
36-LDFLAGS += --static
37+LDFLAGS +=
38 DEPS=../libcap/libcap.a
39 ifeq ($(PTHREADS),yes)
40 DEPS += ../libcap/libpsx.a
41@@ -106,7 +106,7 @@ noexploit: exploit.o $(DEPS)
42
43 # This one runs in a chroot with no shared library files.
44 noop: noop.c
45- $(CC) $(CFLAGS) $< -o $@ --static
46+ $(CC) $(CFLAGS) $< -o $@
47
48 clean:
49 rm -f psx_test libcap_psx_test libcap_launch_test *~
50--
512.17.1
52