diff options
| author | marino <marino@FreeBSD.org> | 2015-03-12 02:27:17 +0800 |
|---|---|---|
| committer | marino <marino@FreeBSD.org> | 2015-03-12 02:27:17 +0800 |
| commit | 3fbc763ca213a06d0bc2145fd9ed6e813250ac9f (patch) | |
| tree | 450ecd07a3ea10f9be0892a6e6c69830154130fd | |
| parent | 55350b89829dcd5417577e5a7c20b2f0dd99d851 (diff) | |
| download | freebsd-ports-gnome-3fbc763ca213a06d0bc2145fd9ed6e813250ac9f.tar.gz freebsd-ports-gnome-3fbc763ca213a06d0bc2145fd9ed6e813250ac9f.tar.zst freebsd-ports-gnome-3fbc763ca213a06d0bc2145fd9ed6e813250ac9f.zip | |
www/webkit-gtk(2,3): Fix build on gcc5 and isolate clang-only flag
PR: 197669
PR: 197671
Submitted by: marino
Approved by: maintainer timeout
| -rw-r--r-- | www/webkit-gtk2/Makefile | 4 | ||||
| -rw-r--r-- | www/webkit-gtk2/files/patch-configure | 20 | ||||
| -rw-r--r-- | www/webkit-gtk3/Makefile | 4 | ||||
| -rw-r--r-- | www/webkit-gtk3/files/patch-configure | 20 |
4 files changed, 42 insertions, 6 deletions
diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile index aee880495d28..423009f0084e 100644 --- a/www/webkit-gtk2/Makefile +++ b/www/webkit-gtk2/Makefile @@ -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 diff --git a/www/webkit-gtk2/files/patch-configure b/www/webkit-gtk2/files/patch-configure new file mode 100644 index 000000000000..283784542671 --- /dev/null +++ b/www/webkit-gtk2/files/patch-configure @@ -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 + diff --git a/www/webkit-gtk3/Makefile b/www/webkit-gtk3/Makefile index 973cfe3e1d55..cb97655fbbc2 100644 --- a/www/webkit-gtk3/Makefile +++ b/www/webkit-gtk3/Makefile @@ -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 diff --git a/www/webkit-gtk3/files/patch-configure b/www/webkit-gtk3/files/patch-configure new file mode 100644 index 000000000000..283784542671 --- /dev/null +++ b/www/webkit-gtk3/files/patch-configure @@ -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 + |