Thu Jun 18 06:17:33 2015 UTC ()

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


(dholland)

diff -r1.10 -r1.11 pkgsrc/security/mhash/distinfo
diff -r0 -r1.1 pkgsrc/security/mhash/patches/patch-include_mutils_mutils.h
diff -r0 -r1.1 pkgsrc/security/mhash/patches/patch-lib_stdfns.c

--- pkgsrc/security/mhash/distinfo 2008/11/08 13:47:11 1.10
+++ pkgsrc/security/mhash/distinfo 2015/06/18 06:17:33 1.11

 @@ -1,11 +1,13 @@
-$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
 Size (mhash-0.9.9.tar.bz2) = 634563 bytes
 SHA1 (mhash-freebsd-patches-20081108.diff.gz) = 832b643bbd88e1a7ea3b88c34ed119fb89c03cc3
 RMD160 (mhash-freebsd-patches-20081108.diff.gz) = b8e1518119660cf33b85d14b9e871f14c7ff0eba
 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

$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

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