From nobody Sat Dec 17 23:13:19 2022 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 4NZMG76jWGz1GPnx; Sat, 17 Dec 2022 23:13:19 +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 4NZMG76CCVz3L28; Sat, 17 Dec 2022 23:13:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671318799; 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=OlageHvVSrFLZ5dkBKhLviE7hPVm8Uy3gGXgK0LkH+Y=; b=ggihXtwq45BgBh/GvAY8kzBAcVtfkEGfXv1SNX/ed6bfwOETEdpJQ8HJ8Pzm/UgF6/dixX WZT5CXS9IpxpWfgELKIH8clukXF0hRn4WwCWXekVBb9HrNT96rW6yR5ZUsnj/UsMcR2p17 CWY5PomIOHMAusPfbPLBlllfB+vsTef8WvruvEJ7f2J9d5myfr61CoeqSBgU617JBNSiwL J0wReDQ6e76qgktVZuCqso+HGSYYoJ7LD9FP5wQOELOWNC7kbMdjeCgNVCw6JQBRg0hc6A xzh5PjO+96tfhoHH8ulPrNt/mlkeUJo9V++PipxCT8ApF71/HuB8stscQ1v6Eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671318799; 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=OlageHvVSrFLZ5dkBKhLviE7hPVm8Uy3gGXgK0LkH+Y=; b=RsrgdMcjjQmiv6vRQTEAbESfk55k/JVqZngGMgAUwd4y3DJnTB7o4ugLm8U5v3T8Accbwx Zr1+T/qJMlLTWcvLXElkzbOoKAmi3ogRq7aRXMKqF0qXasc4JgNHVrclGvCmA2giTu2Oq1 zSby6TEnhEzYwYFXdD8gQtP7TuJQzlrKwcbVK5/oU0hZ6LA6XW3rmRdR2XBl+XtLmJ3/Se Ve0aI+myf6a6T4EFBksSvR4cl4vOV59uf+YqNOWovLs7Gg0ZNXq9cvdgY5AiuMFL+TDpMb Ay6qok+nUROU5EeMF5xzeAMxT+q5CJyOHGCYDjhcByWwC1uxPxOF0e6OtUGy9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671318799; a=rsa-sha256; cv=none; b=izqj9y2K+gwJ7wCyg0ym4Aqxi3x1soNxGZ1GOgLPa71131v5MnYopftVl04bApBDfMby8Y kB8oL6smsTRD2CAS4qrJQC/nkQmRExFiBlDRMF4fuTnUttePPOLuxNTVqCS8t9USsmM7Io VBB7BMJFCvT9l1DYPlIwl6KO1KY9YDMfAt92mdAskasNP5kutPSUf90fLgzdbFFx5WBCkd 3bSGqgW7ST5lt4Qq2f9SUGXR148XwXbdBkMFEM3XCYeo9ztmzs6QY58anqRp8Hbyzdr3qs suk3CxcNuxnQDW3toTgFn0Rv1hxB2l661eLJtdPYWixGDChgYwPOwj/6V8Om0w== 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 4NZMG75HB6z18KZ; Sat, 17 Dec 2022 23:13:19 +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 2BHNDJme016191; Sat, 17 Dec 2022 23:13:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BHNDJkB016190; Sat, 17 Dec 2022 23:13:19 GMT (envelope-from git) Date: Sat, 17 Dec 2022 23:13:19 GMT Message-Id: <202212172313.2BHNDJkB016190@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: c49f3491b8e2 - main - databases/xtrabackup: fix llvm version at 10 explicitely 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: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c49f3491b8e2ca2bbe2fd32f6ccfb0818a0ab9d6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=c49f3491b8e2ca2bbe2fd32f6ccfb0818a0ab9d6 commit c49f3491b8e2ca2bbe2fd32f6ccfb0818a0ab9d6 Author: Tobias C. Berner AuthorDate: 2022-12-17 21:16:33 +0000 Commit: Tobias C. Berner CommitDate: 2022-12-17 23:10:33 +0000 databases/xtrabackup: fix llvm version at 10 explicitely In the previous commit [1] in 2021, clang was locked at 10: Compilation of the embedded mysql server fail with clang 11, use clang 10 as workaround (same as databases/mysql57-server do). As LLVM_DEFAULT will now be higher than 10, explicitely depend on 10. Note: USES=llvm:max=10 would be the preferable solution for this usecase, however, llvm.mk cannot be used after bsd.options.mk at the moment. [1] 106d01226d33ce7f76ca480bb9d9598a3b711b60 PR: 263456 --- databases/xtrabackup/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/databases/xtrabackup/Makefile b/databases/xtrabackup/Makefile index 5223551c9a3c..b984c86c2282 100644 --- a/databases/xtrabackup/Makefile +++ b/databases/xtrabackup/Makefile @@ -48,9 +48,10 @@ PLIST_FILES= bin/xtrabackup bin/xbstream bin/innobackupex bin/xbcrypt \ # 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} +_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