mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-29 05:38:00 +00:00
Code Issues Releases Activity

www/webkit-gtk(2,3): Fix build on gcc5 and isolate clang-only flag

Browse Source 
PR:		197669
PR:		197671
Submitted by:	marino
Approved by:	maintainer timeout
This commit is contained in:
John Marino 2015-03-11 18:27:17 +00:00
parent c4a79d6fc9
commit 5486c6e8eb
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=381025
4 changed files with 42 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/webkit-gtk2/Makefile
View File

@ -77,9 +77,6 @@ DEBUG_CONFIGURE_OFF= --disable-debug-symbols
.include <bsd.port.options.mk>
# Shutup warning spam
CXXFLAGS+= -Wno-c++11-extensions
.if ${ARCH} == powerpc64
CFLAGS+= -mminimal-toc
.endif
@ -96,6 +93,7 @@ CONFIGURE_ENV+= FLEX="${LOCALBASE}/bin/flex"
.endif
.if ${CHOSEN_COMPILER_TYPE} == clang
CXXFLAGS+= -Wno-c++11-extensions # Shutup warning spam
CXXFLAGS+= -Qunused-arguments
.endif

20
www/webkit-gtk2/files/patch-configure Normal file
View File

@ -0,0 +1,20 @@
--- 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

4
www/webkit-gtk3/Makefile
View File

@ -80,9 +80,6 @@ DEBUG_CONFIGURE_OFF= --disable-debug-symbols
.include <bsd.port.options.mk>
# Shutup warning spam
CXXFLAGS+= -Wno-c++11-extensions
.if ${ARCH} == powerpc64
CFLAGS+= -mminimal-toc
.endif
@ -104,6 +101,7 @@ CFLAGS+= -march=i586
.endif
.if ${CHOSEN_COMPILER_TYPE} == clang
CXXFLAGS+= -Wno-c++11-extensions # Shutup warning spam
CXXFLAGS+= -Qunused-arguments
.endif

20
www/webkit-gtk3/files/patch-configure Normal file
View File

@ -0,0 +1,20 @@
--- 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