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

* Remove the FreeBSD patch. It no longer applies and no longer seems needed.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=34006
This commit is contained in:
Eelco Dolstra 2012-05-07 19:56:14 +00:00
parent d0a1fe6b90
commit 6c36eece34
2 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/libraries/openssl/default.nix
View File

@ -23,8 +23,7 @@ let
./gnu.patch # submitted upstream ./gnu.patch # submitted upstream
] ]
++ stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch ++ stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch;
++ stdenv.lib.optional (stdenv.system == "x86_64-freebsd") ./freebsd-x86_64-asm.patch;
in in

16
pkgs/development/libraries/openssl/freebsd-x86_64-asm.patch
View File

@ -1,16 +0,0 @@
Patch for <http://rt.openssl.org/Ticket/Display.html?id=2435&user=guest&pass=guest>.
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$/);