lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

libcap: Fix static build setting LIBCSTATIC=yes

Fixes the build of pkgsStatic.libcap, as it was trying to link to the
dinamic libc. From libcap-2.69/progs/Makefile:

...
ifeq ($(LIBCSTATIC),yes)
LDFLAGS = --static
DEPS = ../libcap/libcap.a
else
# For this build variant override the LDFLAGS to link statically from
# libraries within the build tree. If you never want this, use make
# DYNAMIC=yes . Note, we can't reliably link statically against glibc
# becasuse of https://sourceware.org/bugzilla/show_bug.cgi?id=12491 .
LDFLAGS = -Wl,-Bstatic
LDFLAGS_SUFFIX = -Wl,-Bdynamic
DEPS = ../libcap/libcap.a
endif
...

+1 -1
+1 -1
pkgs/os-specific/linux/libcap/default.nix
··· 41 41 "BUILD_CC=$(CC_FOR_BUILD)" 42 42 "CC:=$(CC)" 43 43 "CROSS_COMPILE=${stdenv.cc.targetPrefix}" 44 - ] ++ lib.optional isStatic "SHARED=no"; 44 + ] ++ lib.optionals isStatic [ "SHARED=no" "LIBCSTATIC=yes" ]; 45 45 46 46 postPatch = '' 47 47 patchShebangs ./progs/mkcapshdoc.sh