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

Merge pull request #76659 from veprbl/pr/cmake_static_adapter

Browse Source 
pkgsStatic: set BUILD_SHARED_LIBS=OFF for cmake
This commit is contained in:
Frederik Rietdijk 2020-01-06 11:58:18 +01:00 committed by GitHub
commit f4b4ef130a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/double-conversion/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, cmake, static ? false }: { stdenv, lib, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "double-conversion"; pname = "double-conversion";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
# Case sensitivity issue # Case sensitivity issue
preConfigure = lib.optionalString stdenv.isDarwin '' preConfigure = lib.optionalString stdenv.isDarwin ''

10
pkgs/development/libraries/fmt/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, enableShared ? true }: { stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "6.0.0"; version = "6.0.0";
@ -17,16 +17,16 @@ stdenv.mkDerivation rec {
cmakeFlags = [ cmakeFlags = [
"-DFMT_TEST=TRUE" "-DFMT_TEST=TRUE"
"-DBUILD_SHARED_LIBS=${if enableShared then "TRUE" else "FALSE"}" "-DBUILD_SHARED_LIBS=TRUE"
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;
doCheck = true; doCheck = true;
# preCheckHook ensures the test binaries can find libfmt.so # preCheckHook ensures the test binaries can find libfmt.so
preCheck = if enableShared preCheck = ''
then "export LD_LIBRARY_PATH=\"$PWD\"" export LD_LIBRARY_PATH="$PWD"
else ""; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Small, safe and fast formatting library"; description = "Small, safe and fast formatting library";

4
pkgs/development/libraries/glog/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, perl, static ? false }: { stdenv, lib, fetchFromGitHub, fetchpatch, cmake, perl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "glog"; pname = "glog";
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
checkInputs = [ perl ]; checkInputs = [ perl ];
doCheck = false; # fails with "Mangled symbols (28 out of 380) found in demangle.dm" doCheck = false; # fails with "Mangled symbols (28 out of 380) found in demangle.dm"

5
pkgs/development/libraries/gtest/default.nix
View File

@ -1,5 +1,4 @@
{ stdenv, cmake, ninja, fetchFromGitHub { stdenv, cmake, ninja, fetchFromGitHub }:
, static ? false }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gtest"; pname = "gtest";
@ -20,7 +19,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ninja ]; nativeBuildInputs = [ cmake ninja ];
cmakeFlags = stdenv.lib.optional (!static) "-DBUILD_SHARED_LIBS=ON"; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Google's framework for writing C++ tests"; description = "Google's framework for writing C++ tests";

1
pkgs/stdenv/adapters.nix
View File

@ -60,6 +60,7 @@ rec {
"--enable-static" "--enable-static"
"--disable-shared" "--disable-shared"
]; ];
cmakeFlags = (args.cmakeFlags or []) ++ [ "-DBUILD_SHARED_LIBS:BOOL=OFF" ];
mesonFlags = (args.mesonFlags or []) ++ [ "-Ddefault_library=static" ]; mesonFlags = (args.mesonFlags or []) ++ [ "-Ddefault_library=static" ];
}); });
}; };

2
pkgs/top-level/all-packages.nix
View File

@ -10792,7 +10792,7 @@ in
arrayfire = callPackage ../development/libraries/arrayfire {}; arrayfire = callPackage ../development/libraries/arrayfire {};
arrow-cpp = callPackage ../development/libraries/arrow-cpp ({ arrow-cpp = callPackage ../development/libraries/arrow-cpp ({
gtest = gtest.override { static = true; }; inherit (pkgsStatic) gtest;
} // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) {
stdenv = overrideCC stdenv buildPackages.gcc6; # hidden symbol `__divmoddi4' stdenv = overrideCC stdenv buildPackages.gcc6; # hidden symbol `__divmoddi4'
}); });

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

@ -185,21 +185,12 @@ in {
static = true; static = true;
twisted = null; twisted = null;
}; };
double-conversion = super.double-conversion.override {
static = true;
};
gmp = super.gmp.override { gmp = super.gmp.override {
withStatic = true; withStatic = true;
}; };
gflags = super.gflags.override { gflags = super.gflags.override {
enableShared = false; enableShared = false;
}; };
glog = super.glog.override {
static = true;
};
gtest = super.gtest.override {
static = true;
};
cdo = super.cdo.override { cdo = super.cdo.override {
enable_all_static = true; enable_all_static = true;
}; };