Date: Thu, 10 Mar 2016 00:18:31 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r410738 - head/security/nss/files Message-ID: <201603100018.u2A0IVeW021986@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603100018.u2A0IVeW021986>