Attachment #248753 for bug #275887




PORTNAME=	or-tools
DISTVERSIONPREFIX=	v
DISTVERSION=	9.8
PORTREVISION=	7
CATEGORIES=	math

MAINTAINER=	yuri@FreeBSD.org

CONFIGURE_ENV=	UNIX_CBC_DIR=${LOCALBASE} UNIX_CLP_DIR=${LOCALBASE}

OPTIONS_DEFINE=		DOCS FLATZINC SCIP
#OPTIONS_DEFAULT=	FLATZINC SCIP
OPTIONS_SUB=		yes

FLATZINC_DESC=		Build FlatZinc - MiniZinc interface


# 3 tests are known to fail, see https://github.com/google/or-tools/issues/3429

post-patch:
	@${REINPLACE_CMD} -e '17,19d' ${WRKSRC}/ortools/base/logging.h

post-install:
	@${FIND} ${STAGEDIR}${PREFIX} -type d -empty -delete


Lines 1-3 Link Here

(-)b/math/or-tools/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1672576120	1	TIMESTAMP = 1699869085
2	SHA256 (google-or-tools-v9.5_GH0.tar.gz) = 57f81b94949d35dc042690db3fa3f53245cffbf6824656e1a03f103a3623c939	2	SHA256 (google-or-tools-v9.8_GH0.tar.gz) = 85e10e7acf0a9d9a3b891b9b108f76e252849418c6230daea94ac429af8a4ea4
3	SIZE (google-or-tools-v9.5_GH0.tar.gz) = 14795911	3	SIZE (google-or-tools-v9.8_GH0.tar.gz) = 19725471




--- 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<ParsedConstraint> 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<ParsedConstraint> 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)));
     }
   }
 

Return to bug 275887

Lines 1-7 Link Here

(-)b/math/or-tools/Makefile (-3 / +5 lines)
1	PORTNAME= or-tools	1	PORTNAME= or-tools
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 9.5	3	DISTVERSION= 9.8
4	PORTREVISION= 7
5	CATEGORIES= math	4	CATEGORIES= math
6		5
7	MAINTAINER= yuri@FreeBSD.org	6	MAINTAINER= yuri@FreeBSD.org
Lines 40-46 CXXFLAGS+= -DABSL_LEGACY_THREAD_ANNOTATIONS Link Here
40	CONFIGURE_ENV= UNIX_CBC_DIR=${LOCALBASE} UNIX_CLP_DIR=${LOCALBASE}	39	CONFIGURE_ENV= UNIX_CBC_DIR=${LOCALBASE} UNIX_CLP_DIR=${LOCALBASE}
41		40
42	OPTIONS_DEFINE= DOCS FLATZINC SCIP	41	OPTIONS_DEFINE= DOCS FLATZINC SCIP
43	OPTIONS_DEFAULT= FLATZINC #SCIP	42	#OPTIONS_DEFAULT= FLATZINC SCIP
44	OPTIONS_SUB= yes	43	OPTIONS_SUB= yes
45		44
46	FLATZINC_DESC= Build FlatZinc - MiniZinc interface	45	FLATZINC_DESC= Build FlatZinc - MiniZinc interface
Lines 55-60 PORTDOCS= * Link Here
55		54
56	# 3 tests are known to fail, see https://github.com/google/or-tools/issues/3429	55	# 3 tests are known to fail, see https://github.com/google/or-tools/issues/3429
57		56
		57	post-patch:
		58	@${REINPLACE_CMD} -e '17,19d' ${WRKSRC}/ortools/base/logging.h
		59
58	post-install:	60	post-install:
59	@${FIND} ${STAGEDIR}${PREFIX} -type d -empty -delete	61	@${FIND} ${STAGEDIR}${PREFIX} -type d -empty -delete
60		62

Removed Link Here

(-)a/math/or-tools/files/patch-abseil (-20 lines)
1	--- ortools/lp_data/lp_parser.cc.orig 2022-11-25 09:21:54 UTC
2	+++ ortools/lp_data/lp_parser.cc
3	@@ -185,7 +185,7 @@ bool LPParser::ParseIntegerVariablesList(StringPiece l
4
5	bool LPParser::ParseConstraint(StringPiece constraint) {
6	const StatusOr<ParsedConstraint> parsed_constraint_or_status =
7	- ::operations_research::glop::ParseConstraint(constraint.as_string());
8	+ ::operations_research::glop::ParseConstraint(std::string(constraint));
9	if (!parsed_constraint_or_status.ok()) return false;
10	const ParsedConstraint& parsed_constraint =
11	parsed_constraint_or_status.value();
12	@@ -414,7 +414,7 @@ StatusOr<ParsedConstraint> ParseConstraint(absl::strin
13	if (ConsumeToken(&constraint, &consumed_name, &consumed_coeff) !=
14	TokenType::END) {
15	return absl::InvalidArgumentError(absl::StrCat(
16	- "End of input was expected, found: ", constraint.as_string()));
17	+ "End of input was expected, found: ", std::string(constraint)));
18	}
19	}
20

Lines 1-11 Link Here

(-)b/math/or-tools/pkg-plist (-26 / +75 lines)
1	%%FLATZINC%%bin/fzn-ortools	1	%%FLATZINC%%bin/fzn-ortools
		2	bin/sat_runner
		3	bin/solve
		4	include/ortools/algorithms/binary_indexed_tree.h
		5	include/ortools/algorithms/binary_search.h
2	include/ortools/algorithms/dense_doubly_linked_list.h	6	include/ortools/algorithms/dense_doubly_linked_list.h
		7	include/ortools/algorithms/duplicate_remover.h
3	include/ortools/algorithms/dynamic_partition.h	8	include/ortools/algorithms/dynamic_partition.h
4	include/ortools/algorithms/dynamic_permutation.h	9	include/ortools/algorithms/dynamic_permutation.h
5	include/ortools/algorithms/find_graph_symmetries.h	10	include/ortools/algorithms/find_graph_symmetries.h
6	include/ortools/algorithms/hungarian.h	11	include/ortools/algorithms/hungarian.h
7	include/ortools/algorithms/knapsack_solver.h	12	include/ortools/algorithms/knapsack_solver.h
8	include/ortools/algorithms/knapsack_solver_for_cuts.h	13	include/ortools/algorithms/knapsack_solver_for_cuts.h
		14	include/ortools/algorithms/python/knapsack_solver_doc.h
		15	include/ortools/algorithms/set_cover.h
		16	include/ortools/algorithms/set_cover_ledger.h
		17	include/ortools/algorithms/set_cover_model.h
		18	include/ortools/algorithms/set_cover_reader.h
		19	include/ortools/algorithms/set_cover_utils.h
9	include/ortools/algorithms/sparse_permutation.h	20	include/ortools/algorithms/sparse_permutation.h
10	include/ortools/base/accurate_sum.h	21	include/ortools/base/accurate_sum.h
11	include/ortools/base/adjustable_priority_queue-inl.h	22	include/ortools/base/adjustable_priority_queue-inl.h
Lines 14-52 include/ortools/base/base_export.h Link Here
14	include/ortools/base/basictypes.h	25	include/ortools/base/basictypes.h
15	include/ortools/base/bitmap.h	26	include/ortools/base/bitmap.h
16	include/ortools/base/case.h	27	include/ortools/base/case.h
17	include/ortools/base/check.h
18	include/ortools/base/cleanup.h	28	include/ortools/base/cleanup.h
19	include/ortools/base/commandlineflags.h	29	include/ortools/base/commandlineflags.h
20	include/ortools/base/container_logging.h	30	include/ortools/base/container_logging.h
21	include/ortools/base/die_if_null.h
22	include/ortools/base/dump_vars.h	31	include/ortools/base/dump_vars.h
23	include/ortools/base/dynamic_library.h	32	include/ortools/base/dynamic_library.h
24	include/ortools/base/encodingutils.h	33	include/ortools/base/encodingutils.h
25	include/ortools/base/file.h	34	include/ortools/base/file.h
26	include/ortools/base/filesystem.h	35	include/ortools/base/filesystem.h
27	include/ortools/base/flags.h
28	include/ortools/base/gzipfile.h	36	include/ortools/base/gzipfile.h