From nobody Tue Jun 06 04:59:36 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QZyvF1xj2z4brFZ; Tue, 6 Jun 2023 04:59:37 +0000 (UTC) (envelope-from git@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 4QZyvF1Fdzz3j9j; Tue, 6 Jun 2023 04:59:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686027577; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fNNmKHWT5TDOp0uN1Fb1592JG6d9yg4auGO1ZFcfpGs=; b=QPvvf78KClB/z847nDy496XLnJHG/2Nr0P36u8/fIWKxN7ZMKZjnBgNTVxH7wk1iWOVFjV 8zX8keQoyKtTGTCPOi4qz1mvY5WH6r7P6uQzXAv6ngC/CEewxAwpWIo4HADmtmcxT7pjdU aexwqyBh4XQahJOcLUVilbCK5lSPajPR9f27wePM5Nnum9ekxwHs38jM7LbV8snyA+hO+5 WTyc0l7FhCyfdrnehJExDTO582luOWljz7m6Nd+rWg9CHh2LI9YZpPRSe/MFjcBtBVqedH Q8/unaYYtYDGbhysz6/G5E2isYnKq6O/ks83RHIB0Uqyrr7GnEMORoZ1c1r/yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686027577; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fNNmKHWT5TDOp0uN1Fb1592JG6d9yg4auGO1ZFcfpGs=; b=JS3dv0QLPv/HuZ8qedLuGHL3ssO9LxYyTdaCzIYlWfpx8i1NKJydv+da+S016YSpCfDSZf kmViaejsDO7eQ2WKQOSCxzPyzCds7gdD/5SJT9CAyS9vomnL8EXU2kVyWMS1Y/xmHTUQ19 hh0CK8YJB9Tnii7u3/UXhYQGtBhmqYS/3Aj69kX+kc5hog5X497dzFo2LUUJCdf43hXlnX MGkh3oI+7AGiWp9gn12K0Zic0EFWH/ptAwEZ2hapjrWLNgI9FO4yxuPGHG0l7J5amM5poi ijVUhxRvXNOAESx4VGxh50BTTtCk2rGtfsAYV0WiuI80KFR4s7YJztp1v7Oh5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686027577; a=rsa-sha256; cv=none; b=L9K37m4HLocTteBncqHmPLmemy4NIQDTWfQFC+VAIFRnEWhG4M114giAfo263MNmounWmo CAO6TOc1mWoron6CmJbbOXUKbbOX98lIPEJEw6qNbHXo2SY46wCBVZ98eZk4i8fO/toL7j KI2s8jmJjL6L6CCTOc6UQeb6PSMMwTTZ+8x2r9N0v8TgHbl7BAuL8Wsna62v5BxMjuozFo zKIW3tYbJ7hQe9KRXIY2Ex0TokHpmbmmmma4abwxVLnC6R9rgTdB9kiKdj/oykINxUmFTD S7KchwgCHD7rxk9O6FNnPxo2EQmSLT/Eya8NvPMZcEIFEZrVtyQOTN1gINHTFg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QZyvF0JnWzH3d; Tue, 6 Jun 2023 04:59:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3564xaeq059478; Tue, 6 Jun 2023 04:59:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3564xa8M059477; Tue, 6 Jun 2023 04:59:36 GMT (envelope-from git) Date: Tue, 6 Jun 2023 04:59:36 GMT Message-Id: <202306060459.3564xa8M059477@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Oleksii Samorukov Subject: git: fcc69d210225 - main - databases/xtrabackup: fix build on the i386 platform List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: samm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fcc69d210225054e6cc9ea207caab294ce18fe8e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by samm: URL: https://cgit.FreeBSD.org/ports/commit/?id=fcc69d210225054e6cc9ea207caab294ce18fe8e commit fcc69d210225054e6cc9ea207caab294ce18fe8e Author: Oleksii Samorukov AuthorDate: 2023-06-06 04:56:40 +0000 Commit: Oleksii Samorukov CommitDate: 2023-06-06 04:58:47 +0000 databases/xtrabackup: fix build on the i386 platform - Copy fix from the databases/mysql57-server to fix boost compliation - Remove all clang workaround as not needed anymore --- databases/xtrabackup/Makefile | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/databases/xtrabackup/Makefile b/databases/xtrabackup/Makefile index c759124e9a52..d5a5f4c0e81f 100644 --- a/databases/xtrabackup/Makefile +++ b/databases/xtrabackup/Makefile @@ -42,20 +42,13 @@ 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 -_LLVM_VERSION= 10 -BUILD_DEPENDS+= clang${_LLVM_VERSION}:devel/llvm${_LLVM_VERSION} -CC= ${LOCALBASE}/bin/clang${_LLVM_VERSION} -CXX= ${LOCALBASE}/bin/clang++${_LLVM_VERSION} -.endif # Not sure why it's trying to install mysql client libraries now post-install: ${RM} -rf ${STAGEDIR}${LOCALBASE}/lib +post-patch: + @${REINPLACE_CMD} -e 's|__clang__|__undefined__|g' \ + ${WRKDIR}/boost_1_59_0/boost/atomic/detail/ops_gcc_x86_dcas.hpp + .include