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

gnutls on darwin: drop patch that is integrated now

Browse Source
This commit is contained in:
Vladimír Čunát 2014-03-05 14:31:16 +01:00
parent f1a707fc74
commit c2cd9852ac
2 changed files with 1 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/gnutls/3.2.nix
View File

@ -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.

59
pkgs/development/libraries/gnutls/fix_gnutls_x86_cpuid_s_multi_definitions.patch
View File

@ -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