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

* Sync with the trunk.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30852
This commit is contained in:
Eelco Dolstra
2011-12-12 16:54:35 +00:00
parent 5de58eb387 b0834a993e
commit eda3fd1730
320 changed files with 4058 additions and 2823 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,6 +6,11 @@ let
opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ]
(throw "openssl needs its platform name cross building" null)
stdenv.cross;
hurdGNUSourcePatch = fetchurl {
url = http://patch-tracker.debian.org/patch/series/dl/openssl/1.0.0e-2.1/gnu_source.patch;
sha256 = "0zp4x8bql92fbqywnigqfsfj2vvabb66wv6g6zgzh0y6js1ic4pn";
};
in
stdenv.mkDerivation {
@@ -26,7 +31,8 @@ stdenv.mkDerivation {
# environment variable is ignored for setuid binaries.
./cert-file.patch
]
++ 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;
buildNativeInputs = [ perl ];
@@ -54,6 +60,17 @@ stdenv.mkDerivation {
export configureFlags="--libdir=lib --cross-compile-prefix=${stdenv.cross.config}- shared ${opensslCrossSystem}"
'';
patches = stdenv.lib.optionals (opensslCrossSystem == "hurd-x86") [
# OpenSSL only defines _GNU_SOURCE on Linux, but we need it on GNU
hurdGNUSourcePatch
# Use the target settings from Debian's "debian-hurd-i386" target.
# see http://patch-tracker.debian.org/patch/series/view/openssl/1.0.0e-2.1/debian-targets.patch
# In particular, this sets the shared library extension properly so that
# make install succeeds
./hurd-target.patch
];
postInstall = ''
# Openssl installs readonly files, which otherwise we can't strip.
# This could at some stdenv hash change be put out of crossAttrs, too

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$/);

12
pkgs/development/libraries/openssl/hurd-target.patch Normal file
View File

@@ -0,0 +1,12 @@
diff -Naur openssl-1.0.0d-orig/Configure openssl-1.0.0d/Configure
--- openssl-1.0.0d-orig/Configure 2010-11-30 17:19:26.000000000 -0500
+++ openssl-1.0.0d/Configure 2011-11-16 13:52:57.614416683 -0500
@@ -563,7 +563,7 @@
"newsos4-gcc","gcc:-O -DB_ENDIAN::(unknown):NEWS4:-lmld -liberty:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::",
##### GNU Hurd
-"hurd-x86", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC",
+"hurd-x86","gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -mtune=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
##### OS/2 EMX
"OS2-EMX", "gcc::::::::",