From nobody Mon Sep 11 03:23:27 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 4RkX9X5LyDz4tKXK; Mon, 11 Sep 2023 03:23:28 +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 4RkX9X0wtBz4JdT; Mon, 11 Sep 2023 03:23:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694402608; 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=hIRX++u3eK5AeBgM8bY4CbPAV68e0qvAu7e1miGyDic=; b=KdPOMbZ4uUJD0wJNCIFJVmllivIQICi3oUqgESBU3tCJKW2b2b2RsrZ1ic8WRFhe++Oo4o DNm/fwLNv3KGrIadWv9LiO/bENSrGa2y+804MsU4uk6RmYvbYBN0mtfNjR+J7T7krh+SjO Sn4Z2wDjuYoAXAu6CnJtJoE1dwx9rkK6H5hj57ymob9It+frpzWNpGJjDqdA48VgrbcRqR RhcHXf0srp7+wi979oSoBW0eoZDy8VsIcNYmZsINz9qItJHNTZaEgnWbtub846vjG/tmWg XgR38SsDo37cIGSHAW7kgvITLT3ovWgi3hk833V71++cl1BjMdpoarA0nKh8hA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694402608; a=rsa-sha256; cv=none; b=Aup6a/C4/VqB3HtCCI0sHACR8xv5Ibd716S2omt8cb5phUAiZ4Olji9S8iqPajahG+XqCJ MF+ocxI/bGKz2IwTqDoJLj09t/1Dz0Syf0xpNYnREoFIkmcwxk5IOSEhNMiNj8ODgTfUuU Rs5aZxbDjCRWdVCvjtIro22/ie4lQ+UMAWGWxK8S11BZyrOfj/F/c3iuT5a1hxTd2STKMg IG2L+Wrv2Gs2LKMRFpllr+ozWLT/LZlTvLtZxHBpl5Qlfu4F8arzDrr9XT2eqodFtmO3Ei no25giyKteyEAwWWEdHaWYVV7eTmoC4dZDPIIjs2HN9hGnI5nCbhWJiALFSMfw== 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=1694402608; 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=hIRX++u3eK5AeBgM8bY4CbPAV68e0qvAu7e1miGyDic=; b=Gh5wT7B3xEHmxoSjrgUkHmVFMUNJ13iZMh6Nj6jvRdiX5ja9/Gu5UOPcwOHk/+ma8lIyoO n1KWScO4qUNzuiCqZONw1YOwTYg0lFZ6v86t/9GTks0kaRqYvvI1QjjE4pEXGlGgDc+KE+ g+5QiZT8kuOyzmACNht41HeABrv9DFjNODXGI+pNwkyiYikpKFL5YztVyxpDbK25GFFYDw cCVPYHI1abSMe8gGaa5Yow2MbEwZ0i1PfvqGtsPEFf5J73Bz0u+l97iePnTh258c8dzoXU KSr03CoaFkWl5bGin7SCPuj7iSgIaCoY5CyBWmU6YAZgP6GCjJkWA4UEMUWKtQ== 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 4RkX9W733CzYxn; Mon, 11 Sep 2023 03:23:27 +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 38B3NRS0043508; Mon, 11 Sep 2023 03:23:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38B3NR0U043505; Mon, 11 Sep 2023 03:23:27 GMT (envelope-from git) Date: Mon, 11 Sep 2023 03:23:27 GMT Message-Id: <202309110323.38B3NR0U043505@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: 5dff756fbe4e - main - math/py-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: 5dff756fbe4ed7037a37789040b48553c851001b Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=5dff756fbe4ed7037a37789040b48553c851001b commit 5dff756fbe4ed7037a37789040b48553c851001b Author: Po-Chuan Hsieh AuthorDate: 2023-09-11 03:18:35 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-09-11 03:22:47 +0000 math/py-or-tools: Fix build with abseil 20230125.0+ and re2 20230601+ Reference: https://github.com/google/or-tools/issues/3655 --- math/py-or-tools/Makefile | 1 + math/py-or-tools/files/patch-abseil | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/math/py-or-tools/Makefile b/math/py-or-tools/Makefile index 00e501d5c5e5..13cf22a54c45 100644 --- a/math/py-or-tools/Makefile +++ b/math/py-or-tools/Makefile @@ -51,6 +51,7 @@ CMAKE_OFF= BUILD_DEPS BUILD_pybind11 INSTALL_BUILD_DEPS BUILD_TESTING BUILD_EXAM CMAKE_ON= BUILD_PYTHON CMAKE_ARGS= -DSWIG_EXECUTABLE=${LOCALBASE}/bin/swig -DFREEBSD_PYTHON_VER=${PYTHON_VER} CONFIGURE_ENV= UNIX_CBC_DIR=${LOCALBASE} UNIX_CLP_DIR=${LOCALBASE} +CXXFLAGS+= -DABSL_LEGACY_THREAD_ANNOTATIONS BUILD_ENV= UNIX_CBC_DIR=${LOCALBASE} UNIX_CLP_DIR=${LOCALBASE} TEST_ENV= ${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} diff --git a/math/py-or-tools/files/patch-abseil b/math/py-or-tools/files/patch-abseil new file mode 100644 index 000000000000..eccc97345062 --- /dev/null +++ b/math/py-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))); + } + } +