diff options
| author | James Cook <james.cook@utoronto.ca> | 2013-07-10 23:26:06 -0700 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-07-11 11:05:32 +0200 |
| commit | de71c8bdb000a1dd3fe83bda7ae4a1935a149698 (patch) | |
| tree | 96bee0623ce7739893bb923189a0fc88ec1c4ab0 /pkgs/development/libraries/qca2 | |
| parent | 8ba92b8895474728ad5861a156d001e4b6ae38cb (diff) | |
| download | nixpkgs-de71c8bdb000a1dd3fe83bda7ae4a1935a149698.tar nixpkgs-de71c8bdb000a1dd3fe83bda7ae4a1935a149698.tar.gz nixpkgs-de71c8bdb000a1dd3fe83bda7ae4a1935a149698.tar.bz2 nixpkgs-de71c8bdb000a1dd3fe83bda7ae4a1935a149698.tar.lz nixpkgs-de71c8bdb000a1dd3fe83bda7ae4a1935a149698.tar.xz nixpkgs-de71c8bdb000a1dd3fe83bda7ae4a1935a149698.tar.zst nixpkgs-de71c8bdb000a1dd3fe83bda7ae4a1935a149698.zip | |
qca2: Patch for gcc 4.7+ (close #738).
Thanks to http://lists.pld-linux.org/mailman/pipermail/pld-cvs-commit/Week-of-Mon-20120917/347917.html
Diffstat (limited to 'pkgs/development/libraries/qca2')
| -rw-r--r-- | pkgs/development/libraries/qca2/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/qca2/gcc47.patch | 12 |
2 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/development/libraries/qca2/default.nix b/pkgs/development/libraries/qca2/default.nix index 1da9ef193b5..952bdfa29ce 100644 --- a/pkgs/development/libraries/qca2/default.nix +++ b/pkgs/development/libraries/qca2/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { EMSA3_SHA512 ///< SHA512, with EMSA3 (ie PKCS#1 Version 1.5) encoding' ''; + patches = [ ./gcc47.patch ]; + configureFlags = "--no-separate-debug-info"; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/qca2/gcc47.patch b/pkgs/development/libraries/qca2/gcc47.patch new file mode 100644 index 00000000000..08711884a57 --- /dev/null +++ b/pkgs/development/libraries/qca2/gcc47.patch @@ -0,0 +1,12 @@ +# Thanks to http://lists.pld-linux.org/mailman/pipermail/pld-cvs-commit/Week-of-Mon-20120917/347917.html +--- qca-2.0.3/src/botantools/botan/botan/secmem.h.orig 2007-04-19 23:26:13.000000000 +0200 ++++ qca-2.0.3/src/botantools/botan/botan/secmem.h 2012-09-16 23:28:43.767480490 +0200 +@@ -214,7 +214,7 @@ + + SecureVector(u32bit n = 0) { MemoryRegion<T>::init(true, n); } + SecureVector(const T in[], u32bit n) +- { MemoryRegion<T>::init(true); set(in, n); } ++ { MemoryRegion<T>::init(true); this->set(in, n); } + SecureVector(const MemoryRegion<T>& in) + { MemoryRegion<T>::init(true); set(in); } + SecureVector(const MemoryRegion<T>& in1, const MemoryRegion<T>& in2) |