libcap: fix static build
It supports static build with SHARED=no; the patch no longer applies. Tested by building pkgsStatic.libcap.
This commit is contained in:
parent
a634ea874a
commit
90691042af
2 changed files with 1 additions and 25 deletions
|
@ -14,8 +14,6 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-TelZDuCah8KC1Vhzf/tbYXXMv9JtWArdEN9E0PBH9sI=";
|
||||
};
|
||||
|
||||
patches = lib.optional isStatic ./no-shared-lib.patch;
|
||||
|
||||
outputs = [ "out" "dev" "lib" "man" "doc" ]
|
||||
++ lib.optional usePam "pam";
|
||||
|
||||
|
@ -31,7 +29,7 @@ stdenv.mkDerivation rec {
|
|||
"PAM_CAP=${if usePam then "yes" else "no"}"
|
||||
"BUILD_CC=$(CC_FOR_BUILD)"
|
||||
"CC:=$(CC)"
|
||||
];
|
||||
] ++ lib.optional isStatic "SHARED=no";
|
||||
|
||||
prePatch = ''
|
||||
# use full path to bash
|
||||
|
|
|
@ -1,22 +0,0 @@
|
|||
diff --git a/libcap/Makefile b/libcap/Makefile
|
||||
index de6a28d..7e4d8ac 100644
|
||||
--- a/libcap/Makefile
|
||||
+++ b/libcap/Makefile
|
||||
@@ -22,7 +22,7 @@ MAJLIBNAME=$(LIBNAME).$(VERSION)
|
||||
MINLIBNAME=$(MAJLIBNAME).$(MINOR)
|
||||
GPERF_OUTPUT = _caps_output.gperf
|
||||
|
||||
-all: $(MINLIBNAME) $(STACAPLIBNAME) pcs $(STAPSXLIBNAME)
|
||||
+all: $(STACAPLIBNAME) pcs $(STAPSXLIBNAME)
|
||||
|
||||
pcs: libcap.pc libpsx.pc
|
||||
|
||||
@@ -93,7 +93,7 @@ cap_test: cap_test.c libcap.h
|
||||
test: cap_test
|
||||
./cap_test
|
||||
|
||||
-install: install-static install-shared
|
||||
+install: install-static
|
||||
|
||||
install-static: install-static-cap install-static-psx
|
||||
|
Loading…
Reference in a new issue