From owner-svn-ports-all@freebsd.org Thu Mar 10 00:18:32 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 79DC8AC9B25; Thu, 10 Mar 2016 00:18:32 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 32005E2A; Thu, 10 Mar 2016 00:18:32 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2A0IVVo021987; Thu, 10 Mar 2016 00:18:31 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2A0IVeW021986; Thu, 10 Mar 2016 00:18:31 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201603100018.u2A0IVeW021986@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 10 Mar 2016 00:18:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r410738 - head/security/nss/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Mar 2016 00:18:32 -0000 Author: jbeich Date: Thu Mar 10 00:18:31 2016 New Revision: 410738 URL: https://svnweb.freebsd.org/changeset/ports/410738 Log: security/nss: refresh patch with version approved upstream Modified: head/security/nss/files/patch-bug1250891 (contents, props changed) Modified: head/security/nss/files/patch-bug1250891 ============================================================================== --- head/security/nss/files/patch-bug1250891 Thu Mar 10 00:17:59 2016 (r410737) +++ head/security/nss/files/patch-bug1250891 Thu Mar 10 00:18:31 2016 (r410738) @@ -37,14 +37,17 @@ diff --git a/coreconf/OpenBSD.mk b/corec diff --git a/coreconf/Werror.mk b/coreconf/Werror.mk --- coreconf/Werror.mk +++ coreconf/Werror.mk -@@ -5,6 +5,12 @@ +@@ -5,6 +5,15 @@ # This sets WARNING_CFLAGS for gcc-like compilers. +ifndef CC_IS_CLANG + CC_IS_CLANG := $(and $(findstring clang, $(shell $(CC) --version 2>&1)), 1) -+ # Export CC_IS_CLANG to save a shell invocation when recursing. ++ # Clang claims GCC 4.2.1 compatibility, see GCC_VERSION ++ CC_IS_GCC = 1 ++ # Export CC_IS_CLANG and CC_IS_GCC to save a shell invocation when recursing. + export CC_IS_CLANG ++ export CC_IS_GCC +endif + ifndef CC_IS_GCC @@ -84,12 +87,14 @@ diff --git a/lib/freebl/Makefile b/lib/f HAVE_INT128_SUPPORT = 1 else ifeq (1,$(CC_IS_GCC)) ifneq (,$(filter 4.6 4.7 4.8 4.9,$(word 1,$(GCC_VERSION)).$(word 2,$(GCC_VERSION)))) -@@ -697,7 +697,7 @@ ifdef INTEL_GCM +@@ -697,8 +697,8 @@ ifdef INTEL_GCM # symbolic names to registers, for example, # .set Htbl, %rdi # So we can't use Clang's integrated assembler with intel-gcm.s. -ifneq (,$(findstring clang,$(shell $(AS) --version))) +-$(OBJDIR)/$(PROG_PREFIX)intel-gcm$(OBJ_SUFFIX): ASFLAGS += -no-integrated-as +ifdef CC_IS_CLANG - $(OBJDIR)/$(PROG_PREFIX)intel-gcm$(OBJ_SUFFIX): ASFLAGS += -no-integrated-as ++$(OBJDIR)/$(PROG_PREFIX)intel-gcm$(OBJ_SUFFIX): CFLAGS += -no-integrated-as endif endif +