From owner-svn-ports-all@freebsd.org Thu Aug 27 06:21:39 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 59BAF3C7FFC; Thu, 27 Aug 2020 06:21:39 +0000 (UTC) (envelope-from tcberner@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4BcXgR1kshz4Dfw; Thu, 27 Aug 2020 06:21:39 +0000 (UTC) (envelope-from tcberner@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 202E71FD06; Thu, 27 Aug 2020 06:21:39 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07R6Ld1f041599; Thu, 27 Aug 2020 06:21:39 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07R6LcoQ041573; Thu, 27 Aug 2020 06:21:38 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <202008270621.07R6LcoQ041573@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Thu, 27 Aug 2020 06:21:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r546322 - head/databases/mysql57-server X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: head/databases/mysql57-server X-SVN-Commit-Revision: 546322 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Aug 2020 06:21:39 -0000 Author: tcberner Date: Thu Aug 27 06:21:38 2020 New Revision: 546322 URL: https://svnweb.freebsd.org/changeset/ports/546322 Log: databases/mysql57-server: fix build on current (temporary fix) - add temporary work around to use llvm from ports on recent currents Modified: head/databases/mysql57-server/Makefile Modified: head/databases/mysql57-server/Makefile ============================================================================== --- head/databases/mysql57-server/Makefile Thu Aug 27 05:37:22 2020 (r546321) +++ head/databases/mysql57-server/Makefile Thu Aug 27 06:21:38 2020 (r546322) @@ -162,6 +162,17 @@ CMAKE_ARGS+= -DWITH_SSL=${OPENSSLBASE} CXXFLAGS+= -fpermissive .endif +# mysql57-server fails to compile with llvm11, which was imported to current in r364284 +# without a version increase (1300109 = r364274). +# Until a proper fix is provided, simply use llvm from ports, which probably could be +# a backport of amongst other tings: +# https://github.com/mysql/mysql-server/commit/08f46b3c00ee70e7ed7825daeb91df2289f80f50 +.if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && ${OSVERSION} >= 1300109 +BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} +CC= ${LOCALBASE}/bin/clang${LLVM_DEFAULT} +CXX= ${LOCALBASE}/bin/clang++${LLVM_DEFAULT} +.endif + post-extract: @${RM} -rv ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h