diff options
| author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-01-20 18:24:52 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-01-21 12:52:52 +0000 |
| commit | 9d0347f17c2d76e487e14e43715d710967ee222f (patch) | |
| tree | e3d6d78d102dfa9fee5c0da6607c583573c947f4 /meta/recipes-support/libcap/files | |
| parent | 2de469f312fb503501a0315abc620c47d03ffa56 (diff) | |
| download | poky-9d0347f17c2d76e487e14e43715d710967ee222f.tar.gz | |
libcap: update to 2.31
(From OE-Core rev: 07fce50afd219049046b9fc080304558c05e51bd)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.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.patch | 26 | ||||
| -rw-r--r-- | meta/recipes-support/libcap/files/0002-tests-do-not-run-target-executables.patch | 33 |
2 files changed, 59 insertions, 0 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 new file mode 100644 index 0000000000..e568cc47c5 --- /dev/null +++ b/meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch | |||
| @@ -0,0 +1,26 @@ | |||
| 1 | From 1179b423cce8d119b42cebfb3daa77c540fdca43 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 3 | Date: Wed, 15 Jan 2020 17:16:28 +0100 | ||
| 4 | Subject: [PATCH] tests: do not statically link a test | ||
| 5 | |||
| 6 | This fails on e.g. centos 7 | ||
| 7 | |||
| 8 | Upstream-Status: Inappropriate [oe-core specific] | ||
| 9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 10 | --- | ||
| 11 | tests/Makefile | 2 +- | ||
| 12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 13 | |||
| 14 | diff --git a/tests/Makefile b/tests/Makefile | ||
| 15 | index 7162cf0..6af47af 100644 | ||
| 16 | --- a/tests/Makefile | ||
| 17 | +++ b/tests/Makefile | ||
| 18 | @@ -29,7 +29,7 @@ psx_test_wrap: psx_test.c $(DEPS) | ||
| 19 | run_libcap_psx_test: libcap_psx_test | ||
| 20 | |||
| 21 | libcap_psx_test: libcap_psx_test.c $(DEPS) | ||
| 22 | - $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create --static | ||
| 23 | + $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create | ||
| 24 | |||
| 25 | clean: | ||
| 26 | rm -f psx_test psx_test_wrap libcap_psx_test | ||
diff --git a/meta/recipes-support/libcap/files/0002-tests-do-not-run-target-executables.patch b/meta/recipes-support/libcap/files/0002-tests-do-not-run-target-executables.patch new file mode 100644 index 0000000000..26d108c209 --- /dev/null +++ b/meta/recipes-support/libcap/files/0002-tests-do-not-run-target-executables.patch | |||
| @@ -0,0 +1,33 @@ | |||
| 1 | From 6309554225e05e76167eda4e0df383fb3d1a62c3 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 3 | Date: Fri, 20 Dec 2019 16:54:05 +0100 | ||
| 4 | Subject: [PATCH] tests: do not run target executables | ||
| 5 | |||
| 6 | Upstream-Status: Inappropriate [oe-core specific] | ||
| 7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 8 | |||
| 9 | --- | ||
| 10 | tests/Makefile | 3 --- | ||
| 11 | 1 file changed, 3 deletions(-) | ||
| 12 | |||
| 13 | diff --git a/tests/Makefile b/tests/Makefile | ||
| 14 | index 95e4ca6..7162cf0 100644 | ||
| 15 | --- a/tests/Makefile | ||
| 16 | +++ b/tests/Makefile | ||
| 17 | @@ -19,8 +19,6 @@ sudotest: test | ||
| 18 | install: all | ||
| 19 | |||
| 20 | run_psx_test: psx_test psx_test_wrap | ||
| 21 | - ./psx_test | ||
| 22 | - ./psx_test_wrap | ||
| 23 | |||
| 24 | psx_test: psx_test.c $(DEPS) | ||
| 25 | $(CC) $(CFLAGS) $(IPATH) -DNOWRAP $< -o $@ $(LIBPSXLIB) | ||
| 26 | @@ -29,7 +27,6 @@ psx_test_wrap: psx_test.c $(DEPS) | ||
| 27 | $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBPSXLIB) -Wl,-wrap,pthread_create | ||
| 28 | |||
| 29 | run_libcap_psx_test: libcap_psx_test | ||
| 30 | - ./libcap_psx_test | ||
| 31 | |||
| 32 | libcap_psx_test: libcap_psx_test.c $(DEPS) | ||
| 33 | $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create --static | ||
