From owner-svn-ports-all@freebsd.org Thu Nov 12 10:19:18 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 590CD2E5C93; Thu, 12 Nov 2020 10:19:18 +0000 (UTC) (envelope-from danfe@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 4CWyJ61xhXz3NL3; Thu, 12 Nov 2020 10:19:18 +0000 (UTC) (envelope-from danfe@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 3599224E98; Thu, 12 Nov 2020 10:19:18 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0ACAJIO2004310; Thu, 12 Nov 2020 10:19:18 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0ACAJH86004308; Thu, 12 Nov 2020 10:19:17 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <202011121019.0ACAJH86004308@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Thu, 12 Nov 2020 10:19:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r554946 - in head/databases/xtrabackup8: . files X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: in head/databases/xtrabackup8: . files X-SVN-Commit-Revision: 554946 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.34 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, 12 Nov 2020 10:19:18 -0000 Author: danfe Date: Thu Nov 12 10:19:17 2020 New Revision: 554946 URL: https://svnweb.freebsd.org/changeset/ports/554946 Log: Allow to build on FreeBSD pre-12.x and i386 by stealing some patches from the `databases/mysql80-server' port. Suggested by: fluffy Added: head/databases/xtrabackup8/files/patch-storage_temptable_include_temptable_lock_free_type.h (contents, props changed) Modified: head/databases/xtrabackup8/Makefile Modified: head/databases/xtrabackup8/Makefile ============================================================================== --- head/databases/xtrabackup8/Makefile Thu Nov 12 10:16:14 2020 (r554945) +++ head/databases/xtrabackup8/Makefile Thu Nov 12 10:19:17 2020 (r554946) @@ -39,12 +39,22 @@ CMAKE_ARGS= -DBUILD_CONFIG:STRING=xtrabackup_release CMAKE_ARGS+= -DWITH_${component}:STRING=system .endfor -post-patch: +# Since MySQL 8.0.20 InnoDB engine uses new memory alligned allocator +# which is broken on i386 due to different size of types and causes a +# 'static_assert(alignof(T) <= alignof(std::max_align_t))' error +.if ${ARCH} == i386 +CMAKE_ARGS+= -DDISABLE_PSI_MEMORY=1 +.endif + +post-extract: # Delete bundled components so we won't accidentally use them, except LZ4 # which cannot be removed just yet @${MV} ${WRKSRC}/extra/lz4 ${WRKSRC} @${RM} -r ${WRKSRC}/extra/* @${MV} ${WRKSRC}/lz4 ${WRKSRC}/extra + +post-patch: + @${REINPLACE_CMD} -e 's,TRUE,true,' ${WRKSRC}/sql/mysqld.cc post-stage: @${RM} -r ${STAGEDIR}${PREFIX}/docs Added: head/databases/xtrabackup8/files/patch-storage_temptable_include_temptable_lock_free_type.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/xtrabackup8/files/patch-storage_temptable_include_temptable_lock_free_type.h Thu Nov 12 10:19:17 2020 (r554946) @@ -0,0 +1,17 @@ +--- storage/temptable/include/temptable/lock_free_type.h.orig 2020-06-16 16:31:03 UTC ++++ storage/temptable/include/temptable/lock_free_type.h +@@ -31,6 +31,14 @@ Lock-free type (selection) implementation. */ + + #include "storage/temptable/include/temptable/constants.h" + ++#if defined(__i386__) //&& defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8) ++/* Fix for clang setting __GCC_ATOMIC_LLONG_LOCK_FREE incorecctly for x86 ++ * https://llvm.org/bugs/show_bug.cgi?id=19355 ++ */ ++#undef ATOMIC_LLONG_LOCK_FREE ++#define ATOMIC_LLONG_LOCK_FREE 2 ++#endif ++ + namespace temptable { + + /** Enum class describing alignment-requirements. */