From owner-svn-ports-head@freebsd.org Sat Jan 12 23:05:02 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 04CCD14A16F5; Sat, 12 Jan 2019 23:05:02 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9DE1D738D8; Sat, 12 Jan 2019 23:05:01 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 92C97A177; Sat, 12 Jan 2019 23:05:01 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x0CN51nr032843; Sat, 12 Jan 2019 23:05:01 GMT (envelope-from linimon@FreeBSD.org) Received: (from linimon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0CN51se032841; Sat, 12 Jan 2019 23:05:01 GMT (envelope-from linimon@FreeBSD.org) Message-Id: <201901122305.x0CN51se032841@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: linimon set sender to linimon@FreeBSD.org using -f From: Mark Linimon Date: Sat, 12 Jan 2019 23:05:01 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: linimon X-SVN-Commit-Paths: in head/databases/percona57-server: . files X-SVN-Commit-Revision: 490083 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 9DE1D738D8 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.969,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jan 2019 23:05:02 -0000 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 + +.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() +