public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #91984 from veprbl/pr/zstd_use_shared_lib

Browse Source 
zstd: build programs and tests against the shared library
This commit is contained in:
Dmitry Kalinkin 2020-07-14 16:34:12 -04:00 committed by GitHub
commit ac94f1ab7e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/tools/compression/zstd/default.nix
View File

@ -2,7 +2,8 @@
, fixDarwinDylibNames , fixDarwinDylibNames
, file , file
, legacySupport ? false , legacySupport ? false
, enableShared ? true }: , static ? false
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "zstd"; pname = "zstd";
@ -28,9 +29,24 @@ stdenv.mkDerivation rec {
# work fine, and I'm not sure how to write the condition. # work fine, and I'm not sure how to write the condition.
++ stdenv.lib.optional stdenv.hostPlatform.isWindows ./mcfgthreads-no-pthread.patch; ++ stdenv.lib.optional stdenv.hostPlatform.isWindows ./mcfgthreads-no-pthread.patch;
postPatch =
# Patch shebangs for playTests
''
patchShebangs programs/zstdgrep
'' + stdenv.lib.optionalString (!static) ''
substituteInPlace build/cmake/CMakeLists.txt \
--replace 'message(SEND_ERROR "You need to build static library to build tests")' ""
substituteInPlace build/cmake/tests/CMakeLists.txt \
--replace 'libzstd_static' 'libzstd_shared'
sed -i \
"1aexport ${stdenv.lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH=$PWD/build_/lib" \
tests/playTests.sh
'';
cmakeFlags = [ cmakeFlags = [
"-DZSTD_BUILD_SHARED:BOOL=${if enableShared then "ON" else "OFF"}" "-DZSTD_BUILD_SHARED:BOOL=${if (!static) then "ON" else "OFF"}"
# They require STATIC for bin/zstd and tests. "-DZSTD_BUILD_STATIC:BOOL=${if static then "ON" else "OFF"}"
"-DZSTD_PROGRAMS_LINK_SHARED:BOOL=${if (!static) then "ON" else "OFF"}"
"-DZSTD_LEGACY_SUPPORT:BOOL=${if legacySupport then "ON" else "OFF"}" "-DZSTD_LEGACY_SUPPORT:BOOL=${if legacySupport then "ON" else "OFF"}"
"-DZSTD_BUILD_TESTS:BOOL=ON" "-DZSTD_BUILD_TESTS:BOOL=ON"
]; ];
@ -56,8 +72,6 @@ stdenv.mkDerivation rec {
substituteInPlace ../programs/zstdless \ substituteInPlace ../programs/zstdless \
--replace "zstdcat" "$bin/bin/zstdcat" --replace "zstdcat" "$bin/bin/zstdcat"
''; '';
# Don't duplicate the library code in runtime closures.
postInstall = stdenv.lib.optionalString enableShared ''rm "$out"/lib/libzstd.a'';
outputs = [ "bin" "dev" "man" "out" ]; outputs = [ "bin" "dev" "man" "out" ];

2
pkgs/top-level/static.nix
View File

@ -242,7 +242,7 @@ in {
}; };
zstd = super.zstd.override { zstd = super.zstd.override {
enableShared = false; static = true;
}; };
llvmPackages_8 = super.llvmPackages_8 // { llvmPackages_8 = super.llvmPackages_8 // {