Page MenuHomeFreeBSD
Files F169697505

D59313.id185612.diff
No OneTemporary
Actions

D59313.id185612.diff
View Options

Index: security/nss/Makefile
===================================================================
--- security/nss/Makefile
+++ security/nss/Makefile
@@ -1,4 +1,5 @@
PORTNAME= nss
+PORTREVISION= 1
DISTVERSION= 3.128
CATEGORIES= security
MASTER_SITES= MOZILLA/security/${PORTNAME}/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src
Index: security/nss/files/patch-coreconf_FreeBSD.mk
===================================================================
--- security/nss/files/patch-coreconf_FreeBSD.mk
+++ security/nss/files/patch-coreconf_FreeBSD.mk
@@ -13,7 +13,7 @@
RANLIB = ranlib
CPU_ARCH = $(OS_TEST)
-@@ -20,7 +20,17 @@ endif
+@@ -20,7 +20,29 @@ endif
ifeq ($(CPU_ARCH),amd64)
CPU_ARCH = x86_64
endif
@@ -27,6 +27,18 @@
+ifneq (,$(findstring 64,$(OS_TEST)))
+USE_64 = 1
+endif
++
++# Test toolchain for endianness copying what coreconf/Linux.mk does to avoid
++# ld: error: duplicate symbol: platform_ghash_support
++# https://github.com/mozilla/nss/blob/NSS_3_128_RTM/coreconf/Linux.mk#L191-L197
++# https://phabricator.services.mozilla.com/D303870
++# https://github.com/mozilla/nss/commit/e57221034e01373bd1b6a5cd654796b1ec89a915
++ENDIANNESS := $(shell echo | $(CC) -dM -E - | grep __BYTE_ORDER__)
++ifeq ($(findstring __ORDER_LITTLE_ENDIAN__,$(ENDIANNESS)),__ORDER_LITTLE_ENDIAN__)
++ LITTLE_ENDIAN := 1
++else
++ LITTLE_ENDIAN := 0
++endif
+
OS_CFLAGS = $(DSO_CFLAGS) -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK

File Metadata

Mime Type
text/plain
Expires
Thu, Sep 3, 7:54 AM (9 h, 27 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
38082986
Default Alt Text
D59313.id185612.diff (1 KB)

Event Timeline