From nobody Wed Oct 5 15:11:50 2022 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 4MjJ2G55MXz4V1YL; Wed, 5 Oct 2022 15:11:50 +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 4MjJ2G4gL9z3dqJ; Wed, 5 Oct 2022 15:11:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664982710; 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=sNjsFWiquqCgKfgpsTxOrO6fuvIytzPvsmo1LSgN6c4=; b=OFvru+BVbNqtUTbbdf/Ji+PlR9iNUu9CZ/LIWI8sKPFV9rT1b/jfQHgZ7HQBfmzvDsmR/L h3bVQGikjGJkZP3VbDuiXsKc2awv5T/XH0BMIy+qZJnnXHksBoUP4Q6ntNcCl3De6uBV+G 1WFQtyztiPijTm36HY0k/jJM9FcOW0uXPKWki7MsDpfWTAce0XVgKWbaSwF882mAibgxFl LYU83p/dcAVGz7wA8uavbOK4ubYeoZZHP93XSJlv9zke07HiOOpUcevXEipyplS4B++/In z8+iXNbttWHWo3p15tppxcnBjS8V6WLN0IiA25vNeUKcb7S2aCH+ug7UK5XssA== 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 4MjJ2G3l2DzwmS; Wed, 5 Oct 2022 15:11:50 +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 295FBoZH050485; Wed, 5 Oct 2022 15:11:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 295FBo77050482; Wed, 5 Oct 2022 15:11:50 GMT (envelope-from git) Date: Wed, 5 Oct 2022 15:11:50 GMT Message-Id: <202210051511.295FBo77050482@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 14d783fc34de - main - cad/horizon-eda: Fix build on -CURRENT and recent -STABLE 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 14d783fc34de4f616297ba2794609fda2dad08d0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664982710; 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=sNjsFWiquqCgKfgpsTxOrO6fuvIytzPvsmo1LSgN6c4=; b=WOOOIbG9zdV8RrboCt3CHpRGSRizQueUJ1pXGdBDEVZRQCeVLuMU/sb0vYm/u+SnuA4lxa UN5dzYQuHNrfDkXloojLPhl0GQG6fMWGNg43GM5aedg7WVDu/5iSiidYyi8zJvpnPA7urE QKwL2qZJp7SFO+CMendGg3BWEmZegbnjYOYQp4MjnZNj9W/bK5HGZLhgwmYRFPQAMFcM9H tz+PdCiTEJYAVbsEcxiJwVgxanWS04eIBlWr+4ivgYtpaGa3juWqel/D3pwF7WqVBWzdK1 7hAeGUjPXfnG9h+FCILxTlxXrIwjgaJ07dp7MALtPmNinbb9zLPY5IzLsv/QcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664982710; a=rsa-sha256; cv=none; b=kDVs/zgUbJjkhPJLjtucJwatPeYv8RTRCYmZmOG6bkC0IQ0t32pqOeQ41pvw27pM6xP2gW zhApUEB0I+t2G3V48mubBZb8Ls98exiOB1x6sKPbL1iJHtEwqTbrtV9W9p0vXekGiZ+d5z 3p85JLZsohuJvWBNc976dBKhZS8ys2YvKU0pluTei8EZiFmEHcLhYahV8+yXED7vY7rooH t6jkPqYP5xKm4F3RDL9wKWS6vox4qUcZXowSpg4Z/TuwQBYGsJ49NpKzm0+O8VdKaVA1q8 FrD1x94ru7fRKa8KD14dFWJ5EGypuScBu8+nwTRg3eMx1yP0jr3y8VlX4yyTAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=14d783fc34de4f616297ba2794609fda2dad08d0 commit 14d783fc34de4f616297ba2794609fda2dad08d0 Author: Martin Neubauer AuthorDate: 2022-10-05 15:10:33 +0000 Commit: Yuri Victorovich CommitDate: 2022-10-05 15:11:48 +0000 cad/horizon-eda: Fix build on -CURRENT and recent -STABLE Add upstream fix as patch until a future release. PR: 266831 --- cad/horizon-eda/Makefile | 2 -- cad/horizon-eda/files/patch-src_util_fs__util.cpp | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/cad/horizon-eda/Makefile b/cad/horizon-eda/Makefile index 1f350fbff464..1d1e50ba1895 100644 --- a/cad/horizon-eda/Makefile +++ b/cad/horizon-eda/Makefile @@ -11,8 +11,6 @@ WWW= https://horizon-eda.org/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_FreeBSD_14= fails to compile (error: no matching function for call to '__search') due to this clang regression: https://github.com/llvm/llvm-project/issues/55683 - BUILD_DEPENDS= ${LOCALBASE}/include/boost/optional.hpp:devel/boost-libs \ cppzmq>0:net/cppzmq \ glm>0:math/glm diff --git a/cad/horizon-eda/files/patch-src_util_fs__util.cpp b/cad/horizon-eda/files/patch-src_util_fs__util.cpp new file mode 100644 index 000000000000..6fa4f04f2d20 --- /dev/null +++ b/cad/horizon-eda/files/patch-src_util_fs__util.cpp @@ -0,0 +1,20 @@ +- workaround for https://github.com/llvm/llvm-project/issues/55683 + +--- src/util/fs_util.cpp.orig 2022-05-29 18:00:44 UTC ++++ src/util/fs_util.cpp +@@ -8,10 +8,10 @@ std::optional get_relative_filename(const + { + const auto p = fs::u8path(path); + const auto b = fs::u8path(base); +- const auto x = std::search(p.begin(), p.end(), b.begin(), b.end()); +- if (x == p.begin()) // path is in base path +- return fs::relative(p, b).u8string(); +- else +- return {}; ++ for (auto ip = p.begin(), ib = b.begin(); ib != b.end(); ip++, ib++) { ++ if (ip == p.end() || *ip != *ib) ++ return {}; ++ } ++ return fs::relative(p, b).u8string(); + } + } // namespace horizon