Browse Source

Merge pull request #11596 from pffmachado/issue-libcan

libcap: fix build failure
lilik-openwrt-22.03
Rosen Penev 4 years ago
committed by GitHub
parent
commit
016039d9e3
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 11 deletions
  1. +10
    -0
      libs/libcap/patches/300-disable-tests.patch
  2. +0
    -11
      libs/libcap/patches/300-uclibc-ng.patch

+ 10
- 0
libs/libcap/patches/300-disable-tests.patch View File

@ -0,0 +1,10 @@
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,6 @@ endif
ifeq ($(GOLANG),yes)
$(MAKE) -C go $@
endif
- $(MAKE) -C tests $@
$(MAKE) -C progs $@
$(MAKE) -C doc $@
$(MAKE) -C kdebug $@

+ 0
- 11
libs/libcap/patches/300-uclibc-ng.patch View File

@ -1,11 +0,0 @@
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -32,7 +32,7 @@ run_libcap_psx_test: libcap_psx_test
./libcap_psx_test
libcap_psx_test: libcap_psx_test.c $(DEPS)
- $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create --static
+ $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create
run_libcap_launch_test: libcap_launch_test libcap_psx_launch_test noop
sudo ./libcap_launch_test

Loading…
Cancel
Save