Attachment #152989 for bug #197669

View | Details | Raw Unified | Return to bug 197669
Collapse All | Expand All





.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 197669

Lines 76-84 Link Here

(-)Makefile (-3 / +1 lines)
76		76
77	.include <bsd.port.options.mk>	77	.include <bsd.port.options.mk>
78		78
79	# Shutup warning spam
80	CXXFLAGS+= -Wno-c++11-extensions
81
82	.if ${ARCH} == powerpc64	79	.if ${ARCH} == powerpc64
83	CFLAGS+= -mminimal-toc	80	CFLAGS+= -mminimal-toc
84	.endif	81	.endif
Lines 95-100 Link Here
95	.endif	92	.endif
96		93
97	.if ${CHOSEN_COMPILER_TYPE} == clang	94	.if ${CHOSEN_COMPILER_TYPE} == clang
		95	CXXFLAGS+= -Wno-c++11-extensions # Shutup warning spam
98	CXXFLAGS+= -Qunused-arguments	96	CXXFLAGS+= -Qunused-arguments
99	.endif	97	.endif
100		98

Line 0 Link Here

(-)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