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

souper: bump to latest--using LLVM 4 and custom KLEE.

Browse Source 
Add patch to fix the build when LLVM reports no system libs,
llvm-config's behavior changed in LLVM r291285.

Fixes #22920.
This commit is contained in:
Will Dietz 2017-02-17 15:47:44 -06:00
parent dcfff701dc
commit 15ca6e149e
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/compilers/souper/cmake-fix.patch Normal file
View File

@ -0,0 +1,14 @@
--- souper-1be75fe6a96993b57dcba038798fe6d1c7d113eb-src/CMakeLists.txt.orig 2017-01-20 13:55:14.783632588 -0600
+++ souper-1be75fe6a96993b57dcba038798fe6d1c7d113eb-src/CMakeLists.txt 2017-01-20 13:55:20.505728456 -0600
@@ -33,7 +33,10 @@
OUTPUT_VARIABLE LLVM_SYSTEM_LIBS
OUTPUT_STRIP_TRAILING_WHITESPACE
)
-set(LLVM_LIBS "${LLVM_LIBS} ${LLVM_SYSTEM_LIBS}")
+
+if (LLVM_SYSTEM_LIBS)
+ set(LLVM_LIBS "${LLVM_LIBS} ${LLVM_SYSTEM_LIBS}")
+endif()
execute_process(
COMMAND ${LLVM_CONFIG_EXECUTABLE} --ldflags

20
pkgs/development/compilers/souper/default.nix
View File

@ -1,22 +1,22 @@
{ stdenv, fetchFromGitHub, cmake, makeWrapper { stdenv, fetchFromGitHub, cmake, makeWrapper
, llvmPackages_39, hiredis, z3_opt, gtest , llvmPackages_4, hiredis, z3_opt, gtest
}: }:
let let
klee = fetchFromGitHub { klee = fetchFromGitHub {
owner = "klee"; owner = "rsas";
repo = "klee"; repo = "klee";
rev = "a743d7072d9ccf11f96e3df45f25ad07da6ad9d6"; rev = "57cd3d43056b029d9da3c6b3c666c4153554c04f";
sha256 = "0qwzs029vlba8xz362n4b00hdm2z3lzhzmvix1r8kpbfrvs8vv91"; sha256 = "197wb7nbirlfpx2jr3afpjjhcj7slc4dxxi02j3kmazz9kcqaygz";
}; };
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "souper-unstable-2017-01-05"; name = "souper-unstable-2017-03-07";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "google"; owner = "google";
repo = "souper"; repo = "souper";
rev = "1be75fe6a96993b57dcba038798fe6d1c7d113eb"; rev = "5faed54ddc4a0e0e12647a0eac1da455a1067a47";
sha256 = "0r8mjb88lwz9a3syx7gwsxlwfg0krffaml04ggaf3ad0cza2mvm8"; sha256 = "1v8ml94ryw5wdls9syvicx4sc9l34yaq8r7cf7is6x7y1q677rps";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -25,12 +25,14 @@ in stdenv.mkDerivation {
]; ];
buildInputs = [ buildInputs = [
llvmPackages_39.llvm llvmPackages_4.llvm
llvmPackages_39.clang-unwrapped llvmPackages_4.clang-unwrapped
hiredis hiredis
gtest gtest
]; ];
patches = [ ./cmake-fix.patch ];
enableParallelBuilding = true; enableParallelBuilding = true;
preConfigure = '' preConfigure = ''