mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-15 07:56:36 +00:00
add upstream patch, to fix "__GNUC_MINOR is not defined" build error that
causes some ports depending on nss to fail. e.g. net-im/pidgin-sipe. The patch is taken from https://bugzilla.mozilla.org/show_bug.cgi?id=702090 This patch will be part of the next nss release and can be removed with the next update. PR: ports/164655 PR: ports/164391 Submitted by: rm
This commit is contained in:
parent
4f51b9d58b
commit
6ebf66408b
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=290207
@ -7,6 +7,7 @@
|
||||
|
||||
PORTNAME= nss
|
||||
PORTVERSION= ${_MAJOR}.${_MINOR}.${_PATCH}
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= security
|
||||
MASTER_SITES= ${MASTER_SITE_MOZILLA}
|
||||
MASTER_SITE_SUBDIR= security/nss/releases/NSS_${PORTVERSION:S/./_/g}_WITH_CKBI_${CKBI_VER:S/./_/}_RTM/src
|
||||
|
23
security/nss/files/patch-bugzilla-702090
Normal file
23
security/nss/files/patch-bugzilla-702090
Normal file
@ -0,0 +1,23 @@
|
||||
Taken from here:
|
||||
https://bug702090.bugzilla.mozilla.org/attachment.cgi?id=575453
|
||||
|
||||
--- ../../security/nss/lib/util/pkcs11n.h.orig 2011-09-14 10:21:10.000000000 +0900
|
||||
+++ ../../security/nss/lib/util/pkcs11n.h 2011-11-19 00:45:01.131860104 +0900
|
||||
@@ -346,7 +346,7 @@
|
||||
* labels have never been accurate to what was really implemented.
|
||||
* The new labels correctly reflect what the values effectively mean.
|
||||
*/
|
||||
-#if __GNUC__ > 3
|
||||
+#if defined(__GNUC__) && (__GNUC__ > 3)
|
||||
/* make GCC warn when we use these #defines */
|
||||
/*
|
||||
* This is really painful because GCC doesn't allow us to mark random
|
||||
@@ -362,7 +362,7 @@
|
||||
* cast the resulting value to the deprecated type in the #define, thus
|
||||
* producting the warning when the #define is used.
|
||||
*/
|
||||
-#if (__GNUC__ == 4) && (__GNUC_MINOR < 5)
|
||||
+#if (__GNUC__ == 4) && (__GNUC_MINOR__ < 5)
|
||||
/* The mac doesn't like the friendlier deprecate messages. I'm assuming this
|
||||
* is a gcc version issue rather than mac or ppc specific */
|
||||
typedef CK_TRUST __CKT_NSS_UNTRUSTED __attribute__((deprecated));
|
Loading…
Reference in New Issue
Block a user