From owner-svn-ports-head@freebsd.org Sun Feb 14 22:09:30 2021 Return-Path: Delivered-To: svn-ports-head@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 67CD953ED0F; Sun, 14 Feb 2021 22:09:30 +0000 (UTC) (envelope-from samm@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Df1cB2WmZz4fRH; Sun, 14 Feb 2021 22:09:30 +0000 (UTC) (envelope-from samm@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 4969E120ED; Sun, 14 Feb 2021 22:09:30 +0000 (UTC) (envelope-from samm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 11EM9U2j080708; Sun, 14 Feb 2021 22:09:30 GMT (envelope-from samm@FreeBSD.org) Received: (from samm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 11EM9Umf080707; Sun, 14 Feb 2021 22:09:30 GMT (envelope-from samm@FreeBSD.org) Message-Id: <202102142209.11EM9Umf080707@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: samm set sender to samm@FreeBSD.org using -f From: Oleksii Samorukov Date: Sun, 14 Feb 2021 22:09:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r565268 - head/databases/xtrabackup X-SVN-Group: ports-head X-SVN-Commit-Author: samm X-SVN-Commit-Paths: head/databases/xtrabackup X-SVN-Commit-Revision: 565268 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 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: Sun, 14 Feb 2021 22:09:30 -0000 Author: samm Date: Sun Feb 14 22:09:29 2021 New Revision: 565268 URL: https://svnweb.freebsd.org/changeset/ports/565268 Log: databases/xtrabackup: fix build on FreeBSD 13 Compilation of the embedded mysql server fail with clang 11, use clang 10 as workaround (same as databases/mysql57-server do) Reported by: pkg-fallout@FreeBSD.org Modified: head/databases/xtrabackup/Makefile Modified: head/databases/xtrabackup/Makefile ============================================================================== --- head/databases/xtrabackup/Makefile Sun Feb 14 21:58:24 2021 (r565267) +++ head/databases/xtrabackup/Makefile Sun Feb 14 22:09:29 2021 (r565268) @@ -28,12 +28,12 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ libgpg-error.so:security/libgpg-error RUN_DEPENDS= qpress:archivers/qpress -CONFLICTS_INSTALL= ${PORTNAME}8 - -# autotool is in use for 5.1 builds USES= alias autoreconf:build bison cmake:noninja compiler:c++11-lang \ cpe gettext libtool perl5 shebangfix USE_CXXSTD= c++11 + +CONFLICTS_INSTALL= ${PORTNAME}8 + CPE_VENDOR= percona SHEBANG_FILES= storage/innobase/xtrabackup/xbcloud_osenv.sh CMAKE_ARGS= -DWITH_BOOST=${WRKDIR}/boost_1_59_0 -DWITH_VERSION_CHECK=OFF @@ -43,8 +43,20 @@ WRKSRC= ${WRKDIR}/percona-${PORTNAME}-${PORTVERSION} PLIST_FILES= bin/xtrabackup bin/xbstream bin/innobackupex bin/xbcrypt \ bin/xbcloud bin/xbcloud_osenv +.include +# xtrabackup/mysql57 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 + # Not sure why it's trying to install mysql client libraries now post-install: ${RM} -rf ${STAGEDIR}${LOCALBASE}/lib -.include +.include