Date: Wed, 11 Mar 2015 18:27:17 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r381025 - in head/www: webkit-gtk2 webkit-gtk2/files webkit-gtk3 webkit-gtk3/files Message-ID: <201503111827.t2BIRIi4050733@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Wed Mar 11 18:27:17 2015 New Revision: 381025 URL: https://svnweb.freebsd.org/changeset/ports/381025 QAT: https://qat.redports.org/buildarchive/r381025/ Log: 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 Added: head/www/webkit-gtk2/files/patch-configure (contents, props changed) head/www/webkit-gtk3/files/patch-configure (contents, props changed) Modified: head/www/webkit-gtk2/Makefile head/www/webkit-gtk3/Makefile Modified: head/www/webkit-gtk2/Makefile ============================================================================== --- head/www/webkit-gtk2/Makefile Wed Mar 11 17:33:39 2015 (r381024) +++ head/www/webkit-gtk2/Makefile Wed Mar 11 18:27:17 2015 (r381025) @@ -77,9 +77,6 @@ DEBUG_CONFIGURE_OFF= --disable-debug-sym .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/f .endif .if ${CHOSEN_COMPILER_TYPE} == clang +CXXFLAGS+= -Wno-c++11-extensions # Shutup warning spam CXXFLAGS+= -Qunused-arguments .endif Added: head/www/webkit-gtk2/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/webkit-gtk2/files/patch-configure Wed Mar 11 18:27:17 2015 (r381025) @@ -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 + Modified: head/www/webkit-gtk3/Makefile ============================================================================== --- head/www/webkit-gtk3/Makefile Wed Mar 11 17:33:39 2015 (r381024) +++ head/www/webkit-gtk3/Makefile Wed Mar 11 18:27:17 2015 (r381025) @@ -80,9 +80,6 @@ DEBUG_CONFIGURE_OFF= --disable-debug-sym .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 Added: head/www/webkit-gtk3/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/webkit-gtk3/files/patch-configure Wed Mar 11 18:27:17 2015 (r381025) @@ -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 +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503111827.t2BIRIi4050733>