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

Making cyrus-sasl build with gcc 4.4. I took a patch from the fedora cvs:

Browse Source 
http://cvs.fedoraproject.org/viewvc/rpms/cyrus-sasl/devel/cyrus-sasl-2.1.22-bad-elif.patch?revision=1.1&view=markup


svn path=/nixpkgs/branches/stdenv-updates/; revision=19044
This commit is contained in:
Lluís Batlle i Rossell 2009-12-19 09:09:39 +00:00
parent 246c17dc9e
commit 76fa225eaa
3 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/development/libraries/cyrus-sasl/cyrus-sasl-2.1.22-bad-elif.patch Normal file
View File

@ -0,0 +1,21 @@
diff -up cyrus-sasl-2.1.22/plugins/digestmd5.c.elif cyrus-sasl-2.1.22/plugins/digestmd5.c
--- cyrus-sasl-2.1.22/plugins/digestmd5.c.elif 2009-01-23 09:40:31.000000000 +0100
+++ cyrus-sasl-2.1.22/plugins/digestmd5.c 2009-02-06 15:20:15.000000000 +0100
@@ -2743,7 +2743,7 @@ static sasl_server_plug_t digestmd5_serv
"DIGEST-MD5", /* mech_name */
#ifdef WITH_RC4
128, /* max_ssf */
-#elif WITH_DES
+#elif defined(WITH_DES)
112,
#else
1,
@@ -4071,7 +4071,7 @@ static sasl_client_plug_t digestmd5_clie
"DIGEST-MD5",
#ifdef WITH_RC4 /* mech_name */
128, /* max ssf */
-#elif WITH_DES
+#elif defined(WITH_DES)
112,
#else
1,

1
pkgs/development/libraries/cyrus-sasl/default.nix
View File

@ -9,4 +9,5 @@ stdenv.mkDerivation {
};
configureFlags="--with-openssl=${openssl} --with-plugindir=\${out}/lib/sasl2 --with-configdir=\${out}/lib/sasl2";
buildInputs = [ openssl db4 gettext ];
patches = [ ./cyrus-sasl-2.1.22-bad-elif.patch ];
}

3
pkgs/top-level/all-packages.nix
View File

@ -3269,8 +3269,7 @@ let
};
cyrus_sasl = import ../development/libraries/cyrus-sasl {
inherit fetchurl openssl db4 gettext;
stdenv = overrideGCC stdenv gcc43;
inherit stdenv fetchurl openssl db4 gettext;
};
db4 = db45;