Date: Sat, 12 Jan 2019 23:05:01 +0000 (UTC) From: Mark Linimon <linimon@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r490083 - in head/databases/percona57-server: . files Message-ID: <201901122305.x0CN51se032841@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: linimon Date: Sat Jan 12 23:05:00 2019 New Revision: 490083 URL: https://svnweb.freebsd.org/changeset/ports/490083 Log: Fix build on gcc-based architectures by removing the assumption that FreeBSD must imply clang. While here, remove duplicate definition from USES. PR: 234580 Submitted by: Piotr Kubaj Approved by: portmgr (tier-2 blanket) Added: head/databases/percona57-server/files/patch-cmake_os_FreeBSD.cmake (contents, props changed) Modified: head/databases/percona57-server/Makefile Modified: head/databases/percona57-server/Makefile ============================================================================== --- head/databases/percona57-server/Makefile Sat Jan 12 23:04:06 2019 (r490082) +++ head/databases/percona57-server/Makefile Sat Jan 12 23:05:00 2019 (r490083) @@ -22,7 +22,7 @@ LIB_DEPENDS= libevent.so:devel/libevent \ SLAVEDIRS= databases/percona57-client \ databases/percona57-pam-for-mysql -USES= bison:build cmake:insource,noninja compiler:c11 compiler:c++11-lib \ +USES= bison:build cmake:insource,noninja compiler:c11 \ cpe libedit localbase perl5 shebangfix MY_DBDIR= /var/db/mysql @@ -83,8 +83,6 @@ USES+= libedit .else LIB_DEPENDS+= libcurl.so:ftp/curl -BROKEN_powerpc64= Does not configure: CMake Error at cmake/os/FreeBSD.cmake:34 (MESSAGE): Unsupported compiler! - # MySQL-Server part OPTIONS_DEFINE= OPENSSL FASTMTX INNODBMEMCACHED TOKUDB OPTIONS_DEFAULT= OPENSSL INNODBMEMCACHED @@ -150,6 +148,10 @@ post-patch: ${WRKSRC}/configure.cmake .include <bsd.port.pre.mk> + +.if ${CHOSEN_COMPILER_TYPE} == gcc +CXXFLAGS+= -fpermissive +.endif .if ${ARCH} == "arm" BROKEN= Does not compile on arm Added: head/databases/percona57-server/files/patch-cmake_os_FreeBSD.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/percona57-server/files/patch-cmake_os_FreeBSD.cmake Sat Jan 12 23:05:00 2019 (r490083) @@ -0,0 +1,11 @@ +--- cmake/os/FreeBSD.cmake.orig 2018-12-16 19:27:57 UTC ++++ cmake/os/FreeBSD.cmake +@@ -30,8 +30,6 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER) + IF(NOT HAVE_SUPPORTED_CLANG_VERSION) + MESSAGE(FATAL_ERROR "Clang 3.3 or newer is required!") + ENDIF() +- ELSE() +- MESSAGE(FATAL_ERROR "Unsupported compiler!") + ENDIF() + ENDIF() +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901122305.x0CN51se032841>