From nobody Mon Sep 11 03:23:26 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 4RkX9V6nFwz4tKXH; Mon, 11 Sep 2023 03:23:26 +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 4RkX9V6MK7z4Jrr; Mon, 11 Sep 2023 03:23:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694402606; 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=R6xLKQYYTHkxsJFrYL9s0RlemZ0G8t7qWvoKNPPcBq0=; b=p6qM76LL+VC+Ma0h83a+56aTbc8smBN+/zf1eSnrztSl9zOIxWOlyMIybv5SZm/TRaiL5I +nMtGziCn79WOBdUan4oGa+/MsKna5uGT48h17o381z9CFRrhasqFjZbRWC3tJgrgZjaCT f522iNmtYZMOx8u+kVpeLb1MnBmqKPY/Wlh0nXHSvMv+Reb7qRMkfiOx+n92d5tacMWqIi IcjdpMHZk2byPfnvDo98rfWfb+TAsJ0a1TPj6q/LvFvgdtzaHo4aOLWcQr24EMvQkHotZQ 9pDo+tCQB4p6Bgf83pw3PKw3nmPIWiGNk7a4N8/npj+KAID4QQyXulXbBLMz9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694402606; a=rsa-sha256; cv=none; b=NHeX3ky7Ippvp5xUJyVfNiHvovVV0rLtscvDbcnM4X7alOeiAOK1zApYeW/rEXR412qTvL payOv+HNmn6mHKf+qBAxqOdXtNuGXZCltB7BHJVwi2g8Jcjh3CLAa69LZUyDE96xrncfJZ nH+Mm7KbRXtZGO8QtUlEzzQ24VOgxq4EpkUTwQzMb5YDLFDu/haqHaxl5CpKVSH4ysHY9A Kj2hA+OxG4vBnxZZ5Lf5PvFoq0dfHSnYUYKaf23SMXiRtuvi0rzYG+mZqrLH+cAWSZsJxo G9yCd+0USoJCANl+puX6luHAS/1XXsHV01zLKkphJKu+h8qHapCIy7hUQFK6WQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694402606; 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=R6xLKQYYTHkxsJFrYL9s0RlemZ0G8t7qWvoKNPPcBq0=; b=q58Zi7wr9X9vlOfy4LqNNyJJa3dMnxcsEI2WbfZzH1nlZbLchugNqf42AR2uBfAHHMykj7 qEHGoF5xYl02B4J9d64AtQUSxE0T1+Py3QaolIHm4/ArHOtphcocsNoClrlpY5tK47fG7q i/p1sK7EPA3NlY6eD7N6PRruPe5GrONeX1Xqk5/ssnt1rHFMpI1/gWKsCHezYgEc8LL91T fac2QAYZY6rqHEIQrBG7MSsLzdncek2gTV/WgypS7Cqv4kPI0CZ4SqUDJeQ31Qkl7sGukz hltp/iEuXUOMtFjB5GfzFDIpEhu7Y6pcRWhqyue2+eA7fZXHmF7lWcpVxjZ+lA== 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 4RkX9V5QbJzYsC; Mon, 11 Sep 2023 03:23:26 +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 38B3NQZZ043453; Mon, 11 Sep 2023 03:23:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38B3NQJj043450; Mon, 11 Sep 2023 03:23:26 GMT (envelope-from git) Date: Mon, 11 Sep 2023 03:23:26 GMT Message-Id: <202309110323.38B3NQJj043450@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: cd1837f2e351 - main - math/or-tools: Fix build with abseil 20230125.0+ and re2 20230601+ 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cd1837f2e351891c3ee678e91a589e51836bff1e Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=cd1837f2e351891c3ee678e91a589e51836bff1e commit cd1837f2e351891c3ee678e91a589e51836bff1e Author: Po-Chuan Hsieh AuthorDate: 2023-09-11 03:18:32 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-09-11 03:22:47 +0000 math/or-tools: Fix build with abseil 20230125.0+ and re2 20230601+ Reference: https://github.com/google/or-tools/issues/3655 --- math/or-tools/Makefile | 1 + math/or-tools/files/patch-abseil | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/math/or-tools/Makefile b/math/or-tools/Makefile index fc1aa696407f..f6ae57e6c979 100644 --- a/math/or-tools/Makefile +++ b/math/or-tools/Makefile @@ -35,6 +35,7 @@ USE_LDCONFIG= yes CMAKE_OFF= BUILD_PYTHON BUILD_DEPS INSTALL_BUILD_DEPS BUILD_EXAMPLES BUILD_SAMPLES CMAKE_ON= BUILD_CXX CMAKE_TESTING_ON= BUILD_EXAMPLES BUILD_CXX_EXAMPLES +CXXFLAGS+= -DABSL_LEGACY_THREAD_ANNOTATIONS CONFIGURE_ENV= UNIX_CBC_DIR=${LOCALBASE} UNIX_CLP_DIR=${LOCALBASE} diff --git a/math/or-tools/files/patch-abseil b/math/or-tools/files/patch-abseil new file mode 100644 index 000000000000..eccc97345062 --- /dev/null +++ b/math/or-tools/files/patch-abseil @@ -0,0 +1,20 @@ +--- ortools/lp_data/lp_parser.cc.orig 2022-11-25 09:21:54 UTC ++++ ortools/lp_data/lp_parser.cc +@@ -185,7 +185,7 @@ bool LPParser::ParseIntegerVariablesList(StringPiece l + + bool LPParser::ParseConstraint(StringPiece constraint) { + const StatusOr parsed_constraint_or_status = +- ::operations_research::glop::ParseConstraint(constraint.as_string()); ++ ::operations_research::glop::ParseConstraint(std::string(constraint)); + if (!parsed_constraint_or_status.ok()) return false; + const ParsedConstraint& parsed_constraint = + parsed_constraint_or_status.value(); +@@ -414,7 +414,7 @@ StatusOr ParseConstraint(absl::strin + if (ConsumeToken(&constraint, &consumed_name, &consumed_coeff) != + TokenType::END) { + return absl::InvalidArgumentError(absl::StrCat( +- "End of input was expected, found: ", constraint.as_string())); ++ "End of input was expected, found: ", std::string(constraint))); + } + } +