|
@@ -0,0 +1,79 @@
|
|
|
+From 9b1c003748d4df78416d50fce139f0875224440b Mon Sep 17 00:00:00 2001
|
|
|
+From: "Andrew G. Morgan" <morgan@kernel.org>
|
|
|
+Date: Tue, 10 Nov 2020 20:47:45 -0800
|
|
|
+Subject: [PATCH] Migrate building progs/tcapsh-static to sudotest
|
|
|
+
|
|
|
+This addresses:
|
|
|
+
|
|
|
+ https://bugzilla.kernel.org/show_bug.cgi?id=210135
|
|
|
+ https://bugs.busybox.net/show_bug.cgi?id=13296
|
|
|
+
|
|
|
+Some notes on expectations:
|
|
|
+
|
|
|
+When building DYNAMIC=yes folk want to avoid depending on a
|
|
|
+static libc.a file in their build tree. The best we can do is
|
|
|
+to move building static test tool objects to sudotest.
|
|
|
+
|
|
|
+ make DYNAMIC=yes clean all test
|
|
|
+
|
|
|
+will build the progs binaries and run the tests with all dynamic
|
|
|
+linking. It will, however, build the libcap.a etc libraries too
|
|
|
+even though they are not used for linking.
|
|
|
+
|
|
|
+ make DYNAMIC=no clean all test
|
|
|
+
|
|
|
+will build the progs binaries and run the tests with all static
|
|
|
+linking. It will, however, build the libcap.so etc libraries too
|
|
|
+even though they are not used for linking.
|
|
|
+
|
|
|
+ make SHARED=no clean all test
|
|
|
+
|
|
|
+will build and link progs and test binaries statically against
|
|
|
+libcap.a. No shared libraries (libcap.so etc) will be built.
|
|
|
+
|
|
|
+In all cases, whether linked against or not, libcap.a is built.
|
|
|
+
|
|
|
+Signed-off-by: Andrew G. Morgan <morgan@kernel.org>
|
|
|
+[Patch taken from upstream:
|
|
|
+https://git.kernel.org/pub/scm/libs/libcap/libcap.git/commit/?id=9b1c003748d4df78416d50fce139f0875224440b]
|
|
|
+Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
|
|
|
+---
|
|
|
+ tests/Makefile | 8 ++++----
|
|
|
+ 1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
+
|
|
|
+diff --git a/tests/Makefile b/tests/Makefile
|
|
|
+index fc39fee..1e7039d 100644
|
|
|
+--- a/tests/Makefile
|
|
|
++++ b/tests/Makefile
|
|
|
+@@ -17,13 +17,13 @@ install: all
|
|
|
+
|
|
|
+ ifeq ($(DYNAMIC),yes)
|
|
|
+ LINKEXTRA=-Wl,-rpath,../libcap
|
|
|
+-DEPS=../libcap/libcap.so ../progs/tcapsh-static
|
|
|
++DEPS=../libcap/libcap.so
|
|
|
+ ifeq ($(PTHREADS),yes)
|
|
|
+ DEPS += ../libcap/libpsx.so
|
|
|
+ endif
|
|
|
+ else
|
|
|
+ LDFLAGS += --static
|
|
|
+-DEPS=../libcap/libcap.a ../progs/tcapsh-static
|
|
|
++DEPS=../libcap/libcap.a
|
|
|
+ ifeq ($(PTHREADS),yes)
|
|
|
+ DEPS += ../libcap/libpsx.a
|
|
|
+ endif
|
|
|
+@@ -71,10 +71,10 @@ libcap_psx_test: libcap_psx_test.c $(DEPS)
|
|
|
+ $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LINKEXTRA) $(LIBCAPLIB) $(LIBPSXLIB) $(LDFLAGS)
|
|
|
+
|
|
|
+ # privileged
|
|
|
+-run_libcap_launch_test: libcap_launch_test noop
|
|
|
++run_libcap_launch_test: libcap_launch_test noop ../progs/tcapsh-static
|
|
|
+ sudo ./libcap_launch_test
|
|
|
+
|
|
|
+-run_libcap_psx_launch_test: libcap_psx_launch_test
|
|
|
++run_libcap_psx_launch_test: libcap_psx_launch_test ../progs/tcapsh-static
|
|
|
+ sudo ./libcap_psx_launch_test
|
|
|
+
|
|
|
+ libcap_launch_test: libcap_launch_test.c $(DEPS)
|
|
|
+--
|
|
|
+2.20.1
|
|
|
+
|