diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-03-05 14:31:16 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-03-05 21:33:56 +0100 |
| commit | c2cd9852acdea18f5ed425b17e2db4307cbb0319 (patch) | |
| tree | fc81b9faa020cfb446c8e77284752271efb1fc20 /pkgs | |
| parent | f1a707fc749407f923f9b1a2ea7b4ea28d47c005 (diff) | |
| download | nixpkgs-c2cd9852acdea18f5ed425b17e2db4307cbb0319.tar nixpkgs-c2cd9852acdea18f5ed425b17e2db4307cbb0319.tar.gz nixpkgs-c2cd9852acdea18f5ed425b17e2db4307cbb0319.tar.bz2 nixpkgs-c2cd9852acdea18f5ed425b17e2db4307cbb0319.tar.lz nixpkgs-c2cd9852acdea18f5ed425b17e2db4307cbb0319.tar.xz nixpkgs-c2cd9852acdea18f5ed425b17e2db4307cbb0319.tar.zst nixpkgs-c2cd9852acdea18f5ed425b17e2db4307cbb0319.zip | |
gnutls on darwin: drop patch that is integrated now
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/gnutls/3.2.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/libraries/gnutls/fix_gnutls_x86_cpuid_s_multi_definitions.patch | 59 |
2 files changed, 1 insertions, 63 deletions
diff --git a/pkgs/development/libraries/gnutls/3.2.nix b/pkgs/development/libraries/gnutls/3.2.nix index e950e463a9b..fff05ed8727 100644 --- a/pkgs/development/libraries/gnutls/3.2.nix +++ b/pkgs/development/libraries/gnutls/3.2.nix @@ -14,10 +14,7 @@ stdenv.mkDerivation rec { patches = # FreeBSD doesn't have <alloca.h>, and Gnulib's `alloca' module isn't used. stdenv.lib.optional stdenv.isFreeBSD ./guile-gnulib-includes.patch - # multiple definitions of '_gnutls_x86_cpuid_s' cause linker to fail. - # the patch is: https://www.gitorious.org/gnutls/gnutls/commit/54768ca1cd9049bbd1c695696ef3c8595c6052db - # discussion: http://osdir.com/ml/gnutls-devel-gnu/2014-02/msg00012.html - ++ stdenv.lib.optional stdenv.isDarwin ./fix_gnutls_x86_cpuid_s_multi_definitions.patch; + ; # Note: GMP is a dependency of Nettle, whose public headers include # GMP headers, hence the hack. diff --git a/pkgs/development/libraries/gnutls/fix_gnutls_x86_cpuid_s_multi_definitions.patch b/pkgs/development/libraries/gnutls/fix_gnutls_x86_cpuid_s_multi_definitions.patch deleted file mode 100644 index 1bc3086faeb..00000000000 --- a/pkgs/development/libraries/gnutls/fix_gnutls_x86_cpuid_s_multi_definitions.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 54768ca1cd9049bbd1c695696ef3c8595c6052db Mon Sep 17 00:00:00 2001 -From: Nikos Mavrogiannopoulos <nmav@redhat.com> -Date: Mon, 10 Feb 2014 10:43:52 +0100 -Subject: [PATCH] do not redefine the _gnutls_x86_cpuid_s symbol - ---- - lib/accelerated/x86/aes-cbc-x86-aesni.c | 2 -- - lib/accelerated/x86/aes-cbc-x86-ssse3.c | 2 -- - lib/accelerated/x86/x86.h | 3 ++- - 3 files changed, 2 insertions(+), 5 deletions(-) - -diff --git a/lib/accelerated/x86/aes-cbc-x86-aesni.c b/lib/accelerated/x86/aes-cbc-x86-aesni.c -index 6d4526f..1a2681f 100644 ---- a/lib/accelerated/x86/aes-cbc-x86-aesni.c -+++ b/lib/accelerated/x86/aes-cbc-x86-aesni.c -@@ -39,8 +39,6 @@ struct aes_ctx { - int enc; - }; - --unsigned int _gnutls_x86_cpuid_s[4]; -- - static int - aes_cipher_init(gnutls_cipher_algorithm_t algorithm, void **_ctx, int enc) - { -diff --git a/lib/accelerated/x86/aes-cbc-x86-ssse3.c b/lib/accelerated/x86/aes-cbc-x86-ssse3.c -index ff24578..2b2440a 100644 ---- a/lib/accelerated/x86/aes-cbc-x86-ssse3.c -+++ b/lib/accelerated/x86/aes-cbc-x86-ssse3.c -@@ -39,8 +39,6 @@ struct aes_ctx { - int enc; - }; - --unsigned int _gnutls_x86_cpuid_s[4]; -- - static int - aes_cipher_init(gnutls_cipher_algorithm_t algorithm, void **_ctx, int enc) - { -diff --git a/lib/accelerated/x86/x86.h b/lib/accelerated/x86/x86.h -index ae04d32..03fc8de 100644 ---- a/lib/accelerated/x86/x86.h -+++ b/lib/accelerated/x86/x86.h -@@ -22,6 +22,8 @@ - - #include <config.h> - -+extern unsigned int _gnutls_x86_cpuid_s[4]; -+ - #if defined(ASM_X86) - - void gnutls_cpuid(unsigned int func, unsigned int *ax, unsigned int *bx, -@@ -43,5 +45,4 @@ unsigned int gnutls_have_cpuid(void); - (nettle_hash_digest_func *) digest_func \ - } - -- - #endif --- -1.7.1 - |