From nobody Wed Nov 08 07:52:17 2023 X-Original-To: dev-commits-ports-all@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 4SQHNy1H5Mz50NRN; Wed, 8 Nov 2023 07:52:18 +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 4SQHNy0qzhz4NPw; Wed, 8 Nov 2023 07:52:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699429938; 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=w8DMhgtl5zuoupXgMbgsliNBcBwFyoxneSK2V3BjYG0=; b=DlxYeVNduuieJv8dAFcp5QoXae8Qfw1s9p+NtVezxjixWt/Mna0cL+LMigb5qny0AoKeOm B3b4stbHcKDlQ9XPDgq8DuMi/cxY0/9eZfuW21r5mQniZo033jfNZWeuSqyOzgENVoJ7Y3 CWwYY9S3CCgpP7hk7vZvkUGNOJZfUfgw57OtsY2j6ZzN/UWMGoORZMbVndotjP21pdSTGC 79TyTtTsUk7wTOKUylAGt+lewDnyQkb5eVAmU4mXD1eGxo2bbKGlP24WM11SggKUTcdpNH 0C9NjtQDwd4QaAVednNuu+OP2FTiJ6rSTQ4z/9u1w4gM20imeCU8msXO0LdMDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699429938; 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=w8DMhgtl5zuoupXgMbgsliNBcBwFyoxneSK2V3BjYG0=; b=tHSOOemUn41XgFYqBoex4qHZv+Ln1rgOw4yIEuApA7hXfSv3VEJIXGMuLN5g9Di6085Mlw 9egVYxyHp/HvpS4VACEjGgqfqZ2fc4SWc06bHiP7RNxedl5WiHIK4FEAhqGigudocrpKy/ NfVU4XccxyODlxpMaTEmLjBtejBsahHe6c1ElbAXgnI0dBgtjK4IEXuSQ7Q9nI0GtbWEcw pfpvYr9hXm1o954o/CamhvKW3DBWmeKjy/q0ph5YKsS553eM1pvqkj1ibCjpfbGHi7HDfX xeVmlMBABfIPENnrc6Lei4xl2UVTcmKyjqYCY8tsZ8hUBa3LDSl+PTrNLZtWtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699429938; a=rsa-sha256; cv=none; b=CcSOYEo3E7xPA+zA+Rf0kQxOeo5gnG4kOBMbNGA5aMFvYApJP5ebRQEfxqPu1zCVa+3w2b SCPpV6Ejn8mqBq2GyjY5KjZ4F1B5pJb1WPAg6ZiYIhCBFxH9t4Jf738I1ZnyuhRGcgAw0h F5AqxJdWWB9WBDhqCf9tmZ2p1ZkZd52fgcb0uUSpALuWTVIQEeJphiECqyzuST/PhrZodF lUOJJGwD2NO1vWxUigLxq5pMx3un4Z/vwVTg8hxDT/0AfvCWJ9YXpjD4MVf53QqOXjXrBx 19COF47joC2PNJwXVnzRm0hkHvJJj0iwGY3UqEbUNXjcr5bATnrfJRGtnE5q1A== 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 4SQHNx73l3z9DJ; Wed, 8 Nov 2023 07:52:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A87qHQI089482; Wed, 8 Nov 2023 07:52:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A87qHB1089479; Wed, 8 Nov 2023 07:52:17 GMT (envelope-from git) Date: Wed, 8 Nov 2023 07:52:17 GMT Message-Id: <202311080752.3A87qHB1089479@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: 78447ad699f4 - main - databases/tiledb: Fix configure with CMake >= 3.27 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 78447ad699f46b28cb98d0564563b8b29b0d40db Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=78447ad699f46b28cb98d0564563b8b29b0d40db commit 78447ad699f46b28cb98d0564563b8b29b0d40db Author: Jason E. Hale AuthorDate: 2023-11-08 07:40:41 +0000 Commit: Jason E. Hale CommitDate: 2023-11-08 07:52:12 +0000 databases/tiledb: Fix configure with CMake >= 3.27 After [1], CMake trusts OPENSSL_ROOT_DIR implicitly, so if isn't set right, OpenSSL may not be found. This project uses OPENSSL_PATHS to set OPENSSL_ROOT_DIR, so CMake tries to find OpenSSL in TILEDB_EP_INSTALL_PREFIX which is problably not where we want to look. Pass ${OPENSSLBASE} to set OPENSSL_PATHS so we are looking in the right location. [1] https://github.com/Kitware/CMake/commit/5cc8a69867ac42333a656607d90059a6db823abd PR: 274225 Approved by: portmgr (blanket build fix) --- databases/tiledb/Makefile | 1 + .../files/patch-cmake_Modules_FindOpenSSL__EP.cmake | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/databases/tiledb/Makefile b/databases/tiledb/Makefile index e2afe37ea635..3be5606a81d6 100644 --- a/databases/tiledb/Makefile +++ b/databases/tiledb/Makefile @@ -31,6 +31,7 @@ CFLAGS_armv6+= -Wno-c++11-narrowing CFLAGS_armv7+= -Wno-c++11-narrowing CFLAGS_i386+= -Wno-c++11-narrowing CMAKE_ARGS= -DCATCH_INCLUDE_DIR=${LOCALBASE}/include/catch2 \ + -DFREEBSD_OPENSSLBASE=${OPENSSLBASE} \ -Dlibmagic_DICTIONARY=/usr/share/misc/magic.mgc CMAKE_OFF= TILEDB_ABSEIL \ TILEDB_ALLOW_REGEX_CHAR_PATH \ diff --git a/databases/tiledb/files/patch-cmake_Modules_FindOpenSSL__EP.cmake b/databases/tiledb/files/patch-cmake_Modules_FindOpenSSL__EP.cmake new file mode 100644 index 000000000000..924f7a6ea2c5 --- /dev/null +++ b/databases/tiledb/files/patch-cmake_Modules_FindOpenSSL__EP.cmake @@ -0,0 +1,15 @@ +Fix search for OpenSSL with CMake >= 3.27. This port uses OPENSSL_PATHS to set +OPENSSL_ROOT_DIR, so CMake tries to find OpenSSL in TILEDB_EP_INSTALL_PREFIX +which is problably not where we want to look. + +--- cmake/Modules/FindOpenSSL_EP.cmake.orig 2023-10-25 06:36:39 UTC ++++ cmake/Modules/FindOpenSSL_EP.cmake +@@ -41,7 +41,7 @@ endif() + endif() + + # Search the path set during the superbuild for the EP. +-set(OPENSSL_PATHS ${TILEDB_EP_INSTALL_PREFIX}) ++set(OPENSSL_PATHS ${FREEBSD_OPENSSLBASE}) + + # Add /usr/local/opt, as Homebrew sometimes installs it there. + set (HOMEBREW_BASE "/usr/local/opt/openssl")