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

OpenSSL: Fix compilation on x86_64-freebsd.

Browse Source 
svn path=/nixpkgs/trunk/; revision=30642
This commit is contained in:
Ludovic Courtès 2011-12-01 10:59:26 +00:00
parent a56033ea14
commit dd4841e833
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,9 @@ stdenv.mkDerivation {
sha256 = "1nr0cf6pf8i4qsnx31kqhiqv402xgn76yhjhlbdri8ma1hgislcj";
};
patches = stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch;
patches =
stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch
++ stdenv.lib.optional (stdenv.system == "x86_64-freebsd") ./freebsd-x86_64-asm.patch;
buildNativeInputs = [ perl ];

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

@ -0,0 +1,16 @@
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$/);