Attachment #152992 for bug #197671





.include <bsd.port.options.mk>

# Shutup warning spam
CXXFLAGS+=	-Wno-c++11-extensions

.if ${ARCH} == powerpc64
CFLAGS+=	-mminimal-toc
.endif

.endif

.if ${CHOSEN_COMPILER_TYPE} == clang
CXXFLAGS+=	-Wno-c++11-extensions	# Shutup warning spam
CXXFLAGS+=	-Qunused-arguments
.endif





--- configure.orig	2015-01-07 09:47:51 UTC
+++ configure
@@ -4890,7 +4890,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-#if !(defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 7)
+#if !(defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)))
 #error Not a supported GCC compiler
 #endif
 
@@ -4948,7 +4948,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-#if !(defined(__GNUG__) && defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 7)
+#if !(defined(__GNUG__) && defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)))
 #error Not a supported G++ compiler
 #endif
 

Return to bug 197671

Lines 79-87 Link Here

(-)webkit-gtk3/Makefile (-3 / +1 lines)
79		79
80	.include <bsd.port.options.mk>	80	.include <bsd.port.options.mk>
81		81
82	# Shutup warning spam
83	CXXFLAGS+= -Wno-c++11-extensions
84
85	.if ${ARCH} == powerpc64	82	.if ${ARCH} == powerpc64
86	CFLAGS+= -mminimal-toc	83	CFLAGS+= -mminimal-toc
87	.endif	84	.endif
Lines 103-108 Link Here
103	.endif	100	.endif
104		101
105	.if ${CHOSEN_COMPILER_TYPE} == clang	102	.if ${CHOSEN_COMPILER_TYPE} == clang
		103	CXXFLAGS+= -Wno-c++11-extensions # Shutup warning spam
106	CXXFLAGS+= -Qunused-arguments	104	CXXFLAGS+= -Qunused-arguments
107	.endif	105	.endif
108		106

Line 0 Link Here

(-)webkit-gtk3/files/patch-configure (+20 lines)
	1	--- configure.orig 2015-01-07 09:47:51 UTC
	2	+++ configure
	3	@@ -4890,7 +4890,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
	4	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
	5	/* end confdefs.h. */
	6
	7	-#if !(defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 7)
	8	+#if !(defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && (__GNUC__ > 4 \|\| (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)))
	9	#error Not a supported GCC compiler
	10	#endif
	11
	12	@@ -4948,7 +4948,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
	13	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
	14	/* end confdefs.h. */
	15
	16	-#if !(defined(__GNUG__) && defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 7)
	17	+#if !(defined(__GNUG__) && defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && (__GNUC__ > 4 \|\| (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)))
	18	#error Not a supported G++ compiler
	19	#endif
	20