From b3001b8c30b96c09ead831f5977558a92bb3009b Mon Sep 17 00:00:00 2001 From: jbeich Date: Wed, 18 Jan 2017 16:33:30 +0000 Subject: lang/spidermonkey24: prefer pre-C++11 decltype from libc++ libc++ 4.0 started to use it within in a way incompatible with __typeof__ which broke build but upstream switched to C++11 long ago to notice -Wmacro-redefined. PR: 216010 MFH: 2017Q1 --- lang/spidermonkey24/Makefile | 2 +- lang/spidermonkey24/files/patch-mfbt_Types.h | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 lang/spidermonkey24/files/patch-mfbt_Types.h diff --git a/lang/spidermonkey24/Makefile b/lang/spidermonkey24/Makefile index c78bd75..a0d16db 100644 --- a/lang/spidermonkey24/Makefile +++ b/lang/spidermonkey24/Makefile @@ -3,7 +3,7 @@ PORTNAME= spidermonkey24 PORTVERSION= 24.2.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= lang MASTER_SITES= MOZILLA/js #http://people.mozilla.org/~sstangl/ diff --git a/lang/spidermonkey24/files/patch-mfbt_Types.h b/lang/spidermonkey24/files/patch-mfbt_Types.h new file mode 100644 index 0000000..7cfdf5e --- /dev/null +++ b/lang/spidermonkey24/files/patch-mfbt_Types.h @@ -0,0 +1,12 @@ +--- ../../mfbt/Types.h.orig 2013-10-29 20:40:19 UTC ++++ ../../mfbt/Types.h +@@ -138,7 +138,9 @@ + */ + #if defined(__GNUC__) && defined(__cplusplus) && \ + !defined(__GXX_EXPERIMENTAL_CXX0X__) && __cplusplus < 201103L ++# ifndef decltype + # define decltype __typeof__ ++# endif + #endif + + #endif /* mozilla_Types_h_ */ -- cgit v1.1