sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 09:49:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

security/nss: refresh patch with version approved upstream

Browse source
This commit is contained in:
Jan Beich 2016-03-10 00:18:31 +00:00
parent c9e338009b
commit dceef331b5
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=410738
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
security/nss/files/patch-bug1250891
View file

@ -37,14 +37,17 @@ diff --git a/coreconf/OpenBSD.mk b/coreconf/OpenBSD.mk
diff --git a/coreconf/Werror.mk b/coreconf/Werror.mk diff --git a/coreconf/Werror.mk b/coreconf/Werror.mk
--- coreconf/Werror.mk --- 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. # This sets WARNING_CFLAGS for gcc-like compilers.
+ifndef CC_IS_CLANG +ifndef CC_IS_CLANG
+ CC_IS_CLANG := $(and $(findstring clang, $(shell $(CC) --version 2>&1)), 1) + 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_CLANG
+ export CC_IS_GCC
+endif +endif
+ +
ifndef CC_IS_GCC ifndef CC_IS_GCC
@ -84,12 +87,14 @@ diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile
HAVE_INT128_SUPPORT = 1 HAVE_INT128_SUPPORT = 1
else ifeq (1,$(CC_IS_GCC)) else ifeq (1,$(CC_IS_GCC))
ifneq (,$(filter 4.6 4.7 4.8 4.9,$(word 1,$(GCC_VERSION)).$(word 2,$(GCC_VERSION)))) 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, # symbolic names to registers, for example,
# .set Htbl, %rdi # .set Htbl, %rdi
# So we can't use Clang's integrated assembler with intel-gcm.s. # So we can't use Clang's integrated assembler with intel-gcm.s.
-ifneq (,$(findstring clang,$(shell $(AS) --version))) -ifneq (,$(findstring clang,$(shell $(AS) --version)))
-$(OBJDIR)/$(PROG_PREFIX)intel-gcm$(OBJ_SUFFIX): ASFLAGS += -no-integrated-as
+ifdef CC_IS_CLANG +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
endif endif