Add Sun Studio build fixes from Joern Clausen in PR 40959.

3 files changed, 34 insertions, 1 deletions

diff --git a/security/mhash/distinfo b/security/mhash/distinfo
index b6c5bba9f19..f76cd3cf48c 100644
--- a/security/mhash/distinfo
+++ b/security/mhash/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2008/11/08 13:47:11 bjs Exp $
+$NetBSD: distinfo,v 1.11 2015/06/18 06:17:33 dholland Exp $
 
 SHA1 (mhash-0.9.9.tar.bz2) = cd72ea80a58bbcc4b1ef96268d03d508ab082529
 RMD160 (mhash-0.9.9.tar.bz2) = bd5ced522314ba559d4a04d33f07df8e6aec2887
@@ -9,3 +9,5 @@ Size (mhash-freebsd-patches-20081108.diff.gz) = 6376 bytes
 SHA1 (patch-aa) = dd0c768a7f710adeaf6350550e97f36dfa3344f3
 SHA1 (patch-ab) = 39d26134ebbc935a6bbbc0876fdc23bc52a8a29f
 SHA1 (patch-ac) = aea5b22ffd9cb13513f4262e401a8ac17f05cf7b
+SHA1 (patch-include_mutils_mutils.h) = f4480583fc5e45c79c27a697442676357327dcbf
+SHA1 (patch-lib_stdfns.c) = f98611e91ea92a9c088523e5a6fad89b12507ee5
diff --git a/security/mhash/patches/patch-include_mutils_mutils.h b/security/mhash/patches/patch-include_mutils_mutils.h
new file mode 100644
index 00000000000..e9524696269
--- /dev/null
+++ b/security/mhash/patches/patch-include_mutils_mutils.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-include_mutils_mutils.h,v 1.1 2015/06/18 06:17:33 dholland Exp $
+
+Sun Studio doesn't understand __const.
+
+--- include/mutils/mutils.h~	2015-06-18 06:08:36.000000000 +0000
++++ include/mutils/mutils.h
+@@ -23,7 +23,7 @@
+ 
+ #include <mutils/mincludes.h>
+ 
+-#if defined(const)
++#if defined(const) || (defined(__sun) && !defined(__GNUC__))
+ #define __const const
+ #endif 
+ 
diff --git a/security/mhash/patches/patch-lib_stdfns.c b/security/mhash/patches/patch-lib_stdfns.c
new file mode 100644
index 00000000000..1f163e66176
--- /dev/null
+++ b/security/mhash/patches/patch-lib_stdfns.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-lib_stdfns.c,v 1.1 2015/06/18 06:17:33 dholland Exp $
+
+Avoid returning expressions of type void.
+
+--- lib/stdfns.c~	2015-06-18 06:08:36.000000000 +0000
++++ lib/stdfns.c
+@@ -222,7 +222,8 @@ mutils_memcpy(void *dest, __const void *
+ 	if ((n < 16) || ((mutils_word32)ptr1 & 0x3) || ((mutils_word32)ptr2 

+ & 0x3))

+ 	{

+-		return mutils_memcpy8(ptr2, ptr1, n);

++		mutils_memcpy8(ptr2, ptr1, n);

++		return;

+ 	}

+ 

+ 	words = n >> 2;