Date: Thu, 3 Sep 2020 18:55:45 +0000 (UTC) From: Jochen Neumeister <joneum@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r547475 - branches/2020Q3/databases/mysql57-server Message-ID: <202009031855.083ItjDH025323@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: joneum Date: Thu Sep 3 18:55:45 2020 New Revision: 547475 URL: https://svnweb.freebsd.org/changeset/ports/547475 Log: MFH: r546322 databases/mysql57-server: fix build on current (temporary fix) - add temporary work around to use llvm from ports on recent currents Approved by: ports-secteam (with hat) Modified: branches/2020Q3/databases/mysql57-server/Makefile Directory Properties: branches/2020Q3/ (props changed) Modified: branches/2020Q3/databases/mysql57-server/Makefile ============================================================================== --- branches/2020Q3/databases/mysql57-server/Makefile Thu Sep 3 18:54:05 2020 (r547474) +++ branches/2020Q3/databases/mysql57-server/Makefile Thu Sep 3 18:55:45 2020 (r547475) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009031855.083ItjDH025323>