diff options
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.patch | 38 |
1 files changed, 14 insertions, 24 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 81fdd2a15c..d9fd48a9db 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 @@ | |||
1 | From e4fe6890e07821d60f01f000a95f7944f3d68139 Mon Sep 17 00:00:00 2001 | 1 | From 03e925f0d68bc51e1acf1ac2014a9c2452c664bf Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Wed, 15 Jan 2020 17:16:28 +0100 | 3 | Date: Wed, 15 Jan 2020 17:16:28 +0100 |
4 | Subject: [PATCH] tests: do not statically link a test | 4 | Subject: [PATCH] tests: do not statically link a test |
@@ -9,35 +9,25 @@ Upstream-Status: Inappropriate [oe-core specific] | |||
9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
10 | 10 | ||
11 | --- | 11 | --- |
12 | tests/Makefile | 8 ++++---- | 12 | tests/Makefile | 4 ++-- |
13 | 1 file changed, 4 insertions(+), 4 deletions(-) | 13 | 1 file changed, 2 insertions(+), 2 deletions(-) |
14 | 14 | ||
15 | diff --git a/tests/Makefile b/tests/Makefile | 15 | diff --git a/tests/Makefile b/tests/Makefile |
16 | index 876a8b9..93a0e3a 100644 | 16 | index d569650..f5ca377 100644 |
17 | --- a/tests/Makefile | 17 | --- a/tests/Makefile |
18 | +++ b/tests/Makefile | 18 | +++ b/tests/Makefile |
19 | @@ -26,23 +26,23 @@ psx_test: psx_test.c $(DEPS) | 19 | @@ -11,7 +11,7 @@ ifeq ($(DYNAMIC),yes) |
20 | run_libcap_psx_test: libcap_psx_test | 20 | LDPATH = LD_LIBRARY_PATH=../libcap |
21 | DEPSBUILD = all | ||
22 | else | ||
23 | -LDFLAGS += --static | ||
24 | +LDFLAGS += | ||
25 | DEPSBUILD = libcap.a libpsx.a | ||
26 | endif | ||
21 | 27 | ||
22 | libcap_psx_test: libcap_psx_test.c $(DEPS) | 28 | @@ -51,7 +51,7 @@ libcap_psx_launch_test: libcap_launch_test.c $(DEPS) |
23 | - $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create --static | ||
24 | + $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create | ||
25 | |||
26 | run_libcap_launch_test: libcap_launch_test libcap_psx_launch_test noop | ||
27 | sudo ./libcap_launch_test | ||
28 | sudo ./libcap_psx_launch_test | ||
29 | |||
30 | libcap_launch_test: libcap_launch_test.c $(DEPS) | ||
31 | - $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBCAPLIB) --static | ||
32 | + $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBCAPLIB) | ||
33 | |||
34 | # this varies only slightly from the above insofar as it currently | ||
35 | # only links in the pthreads fork support. TODO() we need to change | ||
36 | # the source to do something interesting with pthreads. | ||
37 | libcap_psx_launch_test: libcap_launch_test.c $(DEPS) | ||
38 | - $(CC) $(CFLAGS) $(IPATH) -DWITH_PTHREADS $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create --static | ||
39 | + $(CC) $(CFLAGS) $(IPATH) -DWITH_PTHREADS $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create | ||
40 | 29 | ||
30 | # This one runs in a chroot with no shared library files. | ||
41 | noop: noop.c | 31 | noop: noop.c |
42 | - $(CC) $(CFLAGS) $< -o $@ --static | 32 | - $(CC) $(CFLAGS) $< -o $@ --static |
43 | + $(CC) $(CFLAGS) $< -o $@ | 33 | + $(CC) $(CFLAGS) $< -o $@ |