diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-06-27 10:28:31 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-06-27 10:57:03 +0200 |
commit | 637873d8fb4c49cd90813379f6ca7b54c9c97f14 (patch) | |
tree | c6d519d694c99be98715b38ed07d07e75496345c /pkgs/development/libraries/crypto++ | |
parent | 12102562f7f8fb0f25fe109375fcf0e9e4bec394 (diff) | |
download | nixlib-637873d8fb4c49cd90813379f6ca7b54c9c97f14.tar nixlib-637873d8fb4c49cd90813379f6ca7b54c9c97f14.tar.gz nixlib-637873d8fb4c49cd90813379f6ca7b54c9c97f14.tar.bz2 nixlib-637873d8fb4c49cd90813379f6ca7b54c9c97f14.tar.lz nixlib-637873d8fb4c49cd90813379f6ca7b54c9c97f14.tar.xz nixlib-637873d8fb4c49cd90813379f6ca7b54c9c97f14.tar.zst nixlib-637873d8fb4c49cd90813379f6ca7b54c9c97f14.zip |
crypto++: fix tests by not using -O3, refactor
Tests were segfaulting due to compilation with -O3, most likely since building with gcc-4.9. AFAIK it isn't generally safe/advisable to use -O3 anyway. Also do some cleanup and expression refactoring, mostly.
Diffstat (limited to 'pkgs/development/libraries/crypto++')
-rw-r--r-- | pkgs/development/libraries/crypto++/default.nix | 66 |
1 files changed, 30 insertions, 36 deletions
diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix index 053937f1c56d..788d488659af 100644 --- a/pkgs/development/libraries/crypto++/default.nix +++ b/pkgs/development/libraries/crypto++/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, unzip, libtool }: +{ fetchurl, stdenv, unzip }: stdenv.mkDerivation rec { name = "crypto++-5.6.2"; @@ -8,45 +8,38 @@ stdenv.mkDerivation rec { sha256 = "0x1mqpz1v071cfrw4grbw7z734cxnpry1qh2b6rsmcx6nkyd5gsw"; }; - patches = (stdenv.lib.optional (stdenv.system != "i686-cygwin") ./dll.patch) - ++ (stdenv.lib.optional stdenv.isDarwin ./GNUmakefile.patch); - - buildInputs = [ unzip libtool ]; - - # Unpack the thing in a subdirectory. - unpackPhase = '' - echo "unpacking Crypto++ to \`${name}' from \`$PWD'..." - mkdir "${name}" && (cd "${name}" && unzip "$src") - sourceRoot="$PWD/${name}" - ''; - - cxxflags = if stdenv.isi686 then "-march=i686" else - if stdenv.isx86_64 then "-march=nocona -fPIC" else - ""; - - configurePhase = '' - sed -i GNUmakefile \ - -e 's|-march=native|${cxxflags}|g' \ - -e 's|-mtune=native||g' \ - -e '/^CXXFLAGS =/s|-g -O2|-O3|' - ''; - - # I add what 'enableParallelBuilding' would add to the make call, - # if we were using the generic build phase. - buildPhase = '' - make PREFIX="$out" all libcryptopp.so -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES - ''; - - # TODO: Installing cryptotest.exe doesn't seem to be necessary. We run - # that binary during this build anyway to verify everything works. - installPhase = '' - mkdir "$out" - make install PREFIX="$out" - ''; + patches = with stdenv; + lib.optional (system != "i686-cygwin") ./dll.patch + ++ lib.optional isDarwin ./GNUmakefile.patch; + + buildInputs = [ unzip ]; + + sourceRoot = "."; + + configurePhase = let + marchflags = + if stdenv.isi686 then "-march=i686" else + if stdenv.isx86_64 then "-march=nocona -mtune=generic" else + ""; + in + '' + sed -i GNUmakefile \ + -e 's|-march=native|${marchflags} -fPIC|g' \ + -e 's|-mtune=native||g' \ + -e '/^CXXFLAGS =/s|-g ||' + ''; + + enableParallelBuilding = true; + + makeFlags = "PREFIX=$(out)"; + buildFlags = "libcryptopp.so"; doCheck = true; checkPhase = "LD_LIBRARY_PATH=`pwd` make test"; + # prefer -fPIC and .so to .a; cryptotest.exe seems superfluous + postInstall = ''rm "$out"/lib/*.a -r "$out/bin" ''; + meta = with stdenv.lib; { description = "Crypto++, a free C++ class library of cryptographic schemes"; homepage = http://cryptopp.com/; @@ -55,3 +48,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; }; } + |