Author: eelco
Date: Fri Jul 23 15:05:20 2010
New Revision: 22722
URL: https://svn.nixos.org/websvn/nix/?rev=22722&sc=1
Log:
* Doh, we already had OpenSSL 1.0.0. Use the updated Darwin patch.
Replaced:
nixpkgs/branches/x-updates/pkgs/development/libraries/openssl/darwin-arch.patch
- copied unchanged from r22717,
nixpkgs/branches/x-updates/pkgs/development/libraries/openssl/darwin-arch-1.patch
Deleted:
nixpkgs/branches/x-updates/pkgs/development/libraries/openssl/1.x.nix
nixpkgs/branches/x-updates/pkgs/development/libraries/openssl/darwin-arch-1.patch
Modified:
nixpkgs/branches/x-updates/pkgs/development/libraries/openssl/default.nix
nixpkgs/branches/x-updates/pkgs/top-level/all-packages.nix
Copied:
nixpkgs/branches/x-updates/pkgs/development/libraries/openssl/darwin-arch.patch
(from r22717,
nixpkgs/branches/x-updates/pkgs/development/libraries/openssl/darwin-arch-1.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/branches/x-updates/pkgs/development/libraries/openssl/darwin-arch.patch
Fri Jul 23 15:05:20 2010 (r22722, copy of r22717,
nixpkgs/branches/x-updates/pkgs/development/libraries/openssl/darwin-arch-1.patch)
@@ -0,0 +1,16 @@
+The patch is specific to nix: MacOS gcc supports -arch.
+--- a/Configure
++++ b/Configure
+@@ -549,9 +549,9 @@ my %table=(
+ "rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX_RHAPSODY::BN_LLONG
RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::",
+ "darwin-ppc-cc","cc:-arch ppc -O3
-DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR
RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC
-fno-common:-arch ppc -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+ "darwin64-ppc-cc","cc:-arch ppc64 -O3
-DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG
RC4_CHAR RC4_CHUNK DES_UNROLL
BF_PTR:${ppc64_asm}:osx64:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc64
-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+-"darwin-i386-cc","cc:-arch i386 -O3 -fomit-frame-pointer
-DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT
RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC
-fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+-"debug-darwin-i386-cc","cc:-arch i386 -g3
-DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT
RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC
-fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+-"darwin64-x86_64-cc","cc:-arch x86_64 -O3 -DL_ENDIAN -DMD32_REG_T=int
-Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG
RC4_CHAR RC4_CHUNK DES_INT
DES_UNROLL:${x86_64_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch
x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
++"darwin-i386-cc","cc:-O3 -fomit-frame-pointer
-DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT
RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC
-fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
++"debug-darwin-i386-cc","cc:-g3
-DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT
RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC
-fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
++"darwin64-x86_64-cc","cc:-O3 -DL_ENDIAN -DMD32_REG_T=int
-Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG
RC4_CHAR RC4_CHUNK DES_INT
DES_UNROLL:${x86_64_asm}:macosx:dlfcn:darwin-shared:-fPIC
-fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+ "debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG
-DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK
DES_UNROLL
BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+
+ ##### A/UX
Modified:
nixpkgs/branches/x-updates/pkgs/development/libraries/openssl/default.nix
==============================================================================
--- nixpkgs/branches/x-updates/pkgs/development/libraries/openssl/default.nix
Fri Jul 23 14:57:28 2010 (r22721)
+++ nixpkgs/branches/x-updates/pkgs/development/libraries/openssl/default.nix
Fri Jul 23 15:05:20 2010 (r22722)
@@ -14,7 +14,7 @@
sha256 = "0qqgyzfb0alwx329z8bqybzamfl9j2maykykvq6zk3ibq0gvva8q";
};
- patches = stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch;
+ patches = ./darwin-arch.patch;
buildNativeInputs = [ perl ];
@@ -23,10 +23,10 @@
configureFlags = "shared --libdir=lib";
crossAttrs = {
- configurePhase = ''
+ preConfigure=''
export cross=$crossSystem-
- ./Configure --prefix=$out ${opensslCrossSystem} shared
'';
+ configureFlags="--libdir=lib ${opensslCrossSystem} shared";
buildPhase = ''
make CC=$crossConfig-gcc \
AR="$crossConfig-ar r" \
Modified: nixpkgs/branches/x-updates/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/x-updates/pkgs/top-level/all-packages.nix Fri Jul 23
14:57:28 2010 (r22721)
+++ nixpkgs/branches/x-updates/pkgs/top-level/all-packages.nix Fri Jul 23
15:05:20 2010 (r22722)
@@ -5205,11 +5205,6 @@
inherit stdenv perl;
};
- openssl1 = makeOverridable (import ../development/libraries/openssl/1.x.nix)
{
- fetchurl = fetchurlBoot;
- inherit stdenv perl;
- };
-
ortp = import ../development/libraries/ortp {
inherit fetchurl stdenv;
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
