From 6c36eece344d3a78245211846f6b434f3fd78dfd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 7 May 2012 19:56:14 +0000 Subject: [PATCH] * Remove the FreeBSD patch. It no longer applies and no longer seems needed. svn path=/nixpkgs/branches/stdenv-updates/; revision=34006 --- pkgs/development/libraries/openssl/default.nix | 3 +-- .../libraries/openssl/freebsd-x86_64-asm.patch | 16 ---------------- 2 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 pkgs/development/libraries/openssl/freebsd-x86_64-asm.patch diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 9757aee0241..cd164b13f8e 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -23,8 +23,7 @@ let ./gnu.patch # submitted upstream ] - ++ stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch - ++ stdenv.lib.optional (stdenv.system == "x86_64-freebsd") ./freebsd-x86_64-asm.patch; + ++ stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch; in diff --git a/pkgs/development/libraries/openssl/freebsd-x86_64-asm.patch b/pkgs/development/libraries/openssl/freebsd-x86_64-asm.patch deleted file mode 100644 index f52e4dac25f..00000000000 --- a/pkgs/development/libraries/openssl/freebsd-x86_64-asm.patch +++ /dev/null @@ -1,16 +0,0 @@ -Patch for . -Fixes compilation on FreeBSD 8.2 with GNU Make 3.81. - -diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl -index e47116b..dc500ae 100755 ---- a/crypto/perlasm/x86_64-xlate.pl -+++ b/crypto/perlasm/x86_64-xlate.pl -@@ -66,7 +66,7 @@ if ($flavour =~ /\./) { $output = $flavour; undef $flavour; } - my ($outdev,$outino,@junk)=stat($output); - - open STDOUT,">$output" || die "can't open $output: $!" -- if ($stddev!=$outdev || $stdino!=$outino); -+ if (!defined($outdev) || $stddev!=$outdev || $stdino!=$outino); - } - - my $gas=1; $gas=0 if ($output =~ /\.asm$/);