Fix build with clang-3.1.

3 files changed, 31 insertions, 18 deletions

diff --git a/sysutils/cdrtools/distinfo b/sysutils/cdrtools/distinfo
index 003aaac6888..6ab89d94308 100644
--- a/sysutils/cdrtools/distinfo
+++ b/sysutils/cdrtools/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.63 2012/03/07 14:54:44 wiz Exp $
+$NetBSD: distinfo,v 1.64 2012/03/29 13:22:06 wiz Exp $
 
 SHA1 (cdrtools-3.01a07.tar.bz2) = ee4b540e4897ee6637837a097658305d18345999
 RMD160 (cdrtools-3.01a07.tar.bz2) = b8331d826bf64de8bd26c041624a3e41648b6952
 Size (cdrtools-3.01a07.tar.bz2) = 2043525 bytes
-SHA1 (patch-include-schily-mconfig.h) = ad973fb720361fbe900bda12699d46d5ab799326
+SHA1 (patch-include_schily_sha2.h) = 0d9c063b7ebdbdf5cc15d7dda3d80ddb97348013
diff --git a/sysutils/cdrtools/patches/patch-include-schily-mconfig.h b/sysutils/cdrtools/patches/patch-include-schily-mconfig.h
deleted file mode 100644
index 6892099ea2a..00000000000
--- a/sysutils/cdrtools/patches/patch-include-schily-mconfig.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-include-schily-mconfig.h,v 1.1 2011/08/04 11:40:50 joerg Exp $
-
---- include/schily/mconfig.h.orig	2011-08-03 11:32:36.000000000 +0000
-+++ include/schily/mconfig.h
-@@ -151,6 +151,11 @@ extern "C" {
- #endif
- #endif
- 
-+#ifdef __clang__
-+/* Bad interactions with the compiler, so disable this crap... */
-+#undef	HAVE_SCANSTACK
-+#endif
-+
- /*
-  * Allow to overwrite the defines in the makefiles by calling
-  *
diff --git a/sysutils/cdrtools/patches/patch-include_schily_sha2.h b/sysutils/cdrtools/patches/patch-include_schily_sha2.h
new file mode 100644
index 00000000000..c4196292249
--- /dev/null
+++ b/sysutils/cdrtools/patches/patch-include_schily_sha2.h
@@ -0,0 +1,29 @@
+$NetBSD: patch-include_schily_sha2.h,v 1.1 2012/03/29 13:22:07 wiz Exp $
+
+Fix clang-3.1 build:
+sha2.c:1001:2: error: call to 'SHA384Pad' is ambiguous
+        SHA384Pad(context);
+        ^~~~~~~~~
+../include/schily/sha2.h:110:13: note: candidate function
+extern void SHA384Pad           __PR((SHA2_CTX *));
+            ^
+sha2.c:969:14: note: candidate function
+#pragma weak SHA384Pad = SHA512Pad
+             ^
+1 error generated.
+
+--- include/schily/sha2.h.orig	2010-08-27 10:41:30.000000000 +0000
++++ include/schily/sha2.h
+@@ -106,10 +106,12 @@ extern char *SHA256Data		__PR((const UIn
+ extern void SHA384Init		__PR((SHA2_CTX *));
+ extern void SHA384Transform	__PR((UInt64_t state[8],
+ 					const UInt8_t [SHA384_BLOCK_LENGTH]));
++#ifndef  HAVE_PRAGMA_WEAK
+ extern void SHA384Update	__PR((SHA2_CTX *, const UInt8_t *, size_t));
+ extern void SHA384Pad		__PR((SHA2_CTX *));
+ extern void SHA384Final		__PR((UInt8_t [SHA384_DIGEST_LENGTH],
+ 					SHA2_CTX *));
++#endif
+ extern char *SHA384End		__PR((SHA2_CTX *, char *));
+ extern char *SHA384File		__PR((const char *, char *));
+ extern char *SHA384FileChunk	__PR((const char *, char *, off_t, off_t));