nss: Fix build on SunOS with clang.

4 files changed, 37 insertions, 12 deletions

diff --git a/devel/nss/Makefile b/devel/nss/Makefile
index 1e6f7c54574..1c6fc74aabc 100644
--- a/devel/nss/Makefile
+++ b/devel/nss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.144 2017/11/30 16:45:21 adam Exp $
+# $NetBSD: Makefile,v 1.145 2018/01/22 11:43:14 jperkin Exp $
 
 DISTNAME=		nss-${NSS_RELEASE:S/.0$//}
 NSS_RELEASE=		3.34.1
@@ -51,8 +51,12 @@ SO_SUFFIX=		so.1.0
 .endif
 PLIST_SUBST+=		SO_SUFFIX=${SO_SUFFIX:Q}
 
-.if ${OPSYS} == "SunOS" && (${PKGSRC_COMPILER:Mclang} || ${PKGSRC_COMPILER:Mgcc})
-MAKE_ENV+=	NS_USE_GCC=YES
+.if !empty(PKGSRC_COMPILER:Mclang) || !empty(PKGSRC_COMPILER:Mgcc)
+MAKE_ENV.SunOS+=	NS_USE_GCC=YES
+.endif
+
+.if !empty(PKGSRC_COMPILER:Mclang)
+MAKE_ENV.SunOS+=	CC_IS_CLANG=YES
 .endif
 
 SUBST_CLASSES+=		64bit
diff --git a/devel/nss/distinfo b/devel/nss/distinfo
index 35b51c13e89..047312d60c1 100644
--- a/devel/nss/distinfo
+++ b/devel/nss/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.79 2017/11/27 23:49:06 ryoon Exp $
+$NetBSD: distinfo,v 1.80 2018/01/22 11:43:14 jperkin Exp $
 
 SHA1 (nss-3.34.1.tar.gz) = 13bf0f2b6c6b39f3a85c54991a92f92a418c7822
 RMD160 (nss-3.34.1.tar.gz) = 100206175425b11dd409166af4458a11d8569bf2
@@ -6,8 +6,8 @@ SHA512 (nss-3.34.1.tar.gz) = 6cc4826df4202e865e903a2ed05b49f708a047347b7b4d58f9b
 Size (nss-3.34.1.tar.gz) = 9562876 bytes
 SHA1 (patch-am) = bab47640c0d25629f43578e7b788859418b27ecd
 SHA1 (patch-an) = 4ab22f2a575676b5b640bc9a760b83eb05c75e69
-SHA1 (patch-md) = 0a09fd2abb8674a2d301f1b6a5331af5db94178f
-SHA1 (patch-me) = e785e4e12b54f2618746a550a09593c2eede5f65
+SHA1 (patch-md) = 8547c9414332c02221b96719dea1e09cb741f4d1
+SHA1 (patch-me) = 9da633e494c8656f22162b354d9710a770d24345
 SHA1 (patch-mf) = 534fe5f711f60dadc3432bc805a6153535f11709
 SHA1 (patch-mg) = 3c878548c98bdea559a3e653e63e0ed22a2a8834
 SHA1 (patch-mh) = a46d3098a85c3a4a57895a9845bc1741fc5e9561
diff --git a/devel/nss/patches/patch-md b/devel/nss/patches/patch-md
index c25cd554848..135d6dc7750 100644
--- a/devel/nss/patches/patch-md
+++ b/devel/nss/patches/patch-md
@@ -1,10 +1,19 @@
-$NetBSD: patch-md,v 1.2 2013/07/20 09:28:12 ryoon Exp $
+$NetBSD: patch-md,v 1.3 2018/01/22 11:43:14 jperkin Exp $
 
 ???. from www/firefox/patch-ax.
 
---- nss/coreconf/SunOS5.mk.orig	2009-06-29 18:15:11.000000000 +0200
+--- nss/coreconf/SunOS5.mk.orig	2017-11-22 19:31:28.000000000 +0000
 +++ nss/coreconf/SunOS5.mk
-@@ -156,6 +156,10 @@ endif
+@@ -106,7 +106,7 @@ ifdef NS_USE_GCC
+ ifeq ($(USE_64), 1)
+ 	DSO_LDOPTS += -m64
+ endif
+-	DSO_LDOPTS += -shared -h $(notdir $@)
++	DSO_LDOPTS += -shared -Wl,-h,$(notdir $@)
+ else
+ ifeq ($(USE_64), 1)
+ 	ifeq ($(OS_TEST),i86pc)
+@@ -119,6 +119,10 @@ endif
  endif
  DSO_LDOPTS += -z combreloc -z defs -z ignore
  
diff --git a/devel/nss/patches/patch-me b/devel/nss/patches/patch-me
index 7d0d871d087..b893ef55550 100644
--- a/devel/nss/patches/patch-me
+++ b/devel/nss/patches/patch-me
@@ -1,10 +1,10 @@
-$NetBSD: patch-me,v 1.2 2013/07/20 09:28:12 ryoon Exp $
+$NetBSD: patch-me,v 1.3 2018/01/22 11:43:14 jperkin Exp $
 
 Add DragonFly support.
 
---- nss/lib/freebl/Makefile.orig	2009-06-29 18:15:13.000000000 +0200
+--- nss/lib/freebl/Makefile.orig	2018-01-22 11:22:38.812914721 +0000
 +++ nss/lib/freebl/Makefile
-@@ -212,7 +212,7 @@ endif
+@@ -298,7 +298,7 @@ endif
  # to bind the blapi function references in FREEBLVector vector
  # (ldvector.c) to the blapi functions defined in the freebl
  # shared libraries.
@@ -13,3 +13,15 @@ Add DragonFly support.
      MKSHLIB += -Wl,-Bsymbolic
  endif
  
+@@ -450,7 +450,11 @@ else
+     ifdef NS_USE_GCC
+ 	LD = gcc
+ 	AS = gcc
++        ifdef CC_IS_CLANG
++	ASFLAGS = -no-integrated-as
++        else
+ 	ASFLAGS = -x assembler-with-cpp
++        endif
+     endif
+     ifeq ($(USE_64),1)
+ 	# Solaris for AMD64