libcap: build without pthreads

This commit is contained in:
Leonid Pliushch 2020-11-09 00:37:58 +02:00
parent eb22f7da1a
commit b82faa4a6f
2 changed files with 3 additions and 14 deletions

View File

@ -1,12 +0,0 @@
diff -u -r ../libcap-2.28/Make.Rules ./Make.Rules
--- ../libcap-2.28/Make.Rules 2019-12-07 20:10:11.000000000 +0000
+++ ./Make.Rules 2019-12-11 23:41:49.847418000 +0000
@@ -62,7 +62,7 @@
LD=$(CC) -Wl,-x -shared
LDFLAGS := #-g
LIBCAPLIB := -L$(topdir)/libcap -lcap
-LIBPSXLIB := -L$(topdir)/libcap -lpsx -lpthread
+LIBPSXLIB := -L$(topdir)/libcap -lpsx
BUILD_GPERF := $(shell which gperf >/dev/null 2>/dev/null && echo yes)

View File

@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://sites.google.com/site/fullycapable/
TERMUX_PKG_DESCRIPTION="POSIX 1003.1e capabilities"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_VERSION=2.45
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=d66639f765c0e10557666b00f519caf0bd07a95f867dddaee131cd284fac3286
TERMUX_PKG_DEPENDS="attr"
@ -10,9 +11,9 @@ TERMUX_PKG_REPLACES="libcap-dev"
TERMUX_PKG_BUILD_IN_SRC=true
termux_step_make() {
make CC="$CC -Wl,-rpath=$TERMUX_PREFIX/lib -Wl,--enable-new-dtags" PREFIX="$TERMUX_PREFIX"
make CC="$CC -Wl,-rpath=$TERMUX_PREFIX/lib -Wl,--enable-new-dtags" PREFIX="$TERMUX_PREFIX" PTHREADS=no
}
termux_step_make_install() {
make CC="$CC -Wl,-rpath=$TERMUX_PREFIX/lib -Wl,--enable-new-dtags" prefix="$TERMUX_PREFIX" RAISE_SETFCAP=no lib=/lib install
make CC="$CC -Wl,-rpath=$TERMUX_PREFIX/lib -Wl,--enable-new-dtags" prefix="$TERMUX_PREFIX" RAISE_SETFCAP=no lib=/lib PTHREADS=no install
}