Date: Sat, 8 May 2021 22:57:18 GMT From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: c8f7f649c969 - main - math/gecode: Change to GNU autotools; Add options; Add test targets Message-ID: <202105082257.148MvIlc037544@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=c8f7f649c96991e1d714757179e642bfd0b98ae2 commit c8f7f649c96991e1d714757179e642bfd0b98ae2 Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2021-05-08 22:55:04 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2021-05-08 22:57:16 +0000 math/gecode: Change to GNU autotools; Add options; Add test targets cmake isn't a default build system for Gecode. Test targets are missing there, and at least one problem produces a wrong result when Gecode is built with cmake (zebra_inverse.mzn). --- math/gecode/Makefile | 59 +++++++++++++++---- math/gecode/distinfo | 8 +-- math/gecode/pkg-plist | 156 ++++++++++++++++++++++++++++--------------------- math/minizinc/Makefile | 2 +- 4 files changed, 142 insertions(+), 83 deletions(-) diff --git a/math/gecode/Makefile b/math/gecode/Makefile index 76cc4b86ab1c..11c71acab4f6 100644 --- a/math/gecode/Makefile +++ b/math/gecode/Makefile @@ -3,11 +3,11 @@ PORTNAME= gecode DISTVERSIONPREFIX= release- DISTVERSION= 6.3.0 +PORTREVISION= 1 CATEGORIES= math PATCH_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/ PATCHFILES= 3b86d0dabc371d5976c5dafef0fc7f6c5f92640b.patch:-p1 # https://github.com/Gecode/gecode/pull/102: Fix MOC invocation in gist folder -PATCHFILES+= b8954e4e5a4c0faf65eb72d62f7e7b377bea14bb.patch:-p1 # https://github.com/Gecode/gecode/pull/104: Ready fzn-gecode as MiniZinc solver on make install MAINTAINER= yuri@FreeBSD.org COMMENT= Generic Constraint Development Environment @@ -18,22 +18,61 @@ LICENSE_COMB= multi NOT_FOR_ARCHS= aarch64 armv6 armv7 mips mips64 NOT_FOR_ARCHS_REASON= needs code written to specify rounding control mechanism in Boost.Numeric.Interval -USES= bison:alias cmake compiler:c++11-lang +USES= bison:alias compiler:c++11-lang gmake perl5 +USE_PERL5= build +USE_LDCONFIG= yes + +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-examples USE_GITHUB= yes GH_ACCOUNT= Gecode -GH_TAGNAME= 9428cd8 # 6.3.0 branch is ready for a long time, but hasn't been tagged yet - -CMAKE_ON= BUILD_SHARED_LIBS +GH_TAGNAME= 96ca4cc # 6.3.0 branch is ready for a long time, but hasn't been tagged yet DATADIR= ${PREFIX}/share/minizinc/gecode # it only installs the MiniZinc library into DATADIR -OPTIONS_DEFINE= GIST +OPTIONS_DEFINE= AUDIT CBS FLATZINC GIST PEAKHEAP PROFILE SEARCH +OPTIONS_DEFAULT= CBS FLATZINC SEARCH OPTIONS_SUB= yes -GIST_DESC= Enable gist, graphical and interactive search tool -GIST_CMAKE_BOOL= ENABLE_GIST -GIST_USES= qt:5 -GIST_USE= qt=core,gui,printsupport,widgets,qmake_build,buildtools_build +AUDIT_DESC= Build with auditing code +AUDIT_CONFIGURE_ENABLE= audit + +CBS_DESC= Support for counting-based search +CBS_CONFIGURE_ENABLE= cbs + +FLATZINC_DESC= Build FlatZinc interpreter +FLATZINC_CONFIGURE_ENABLE= flatzinc + +GIST_DESC= Enable gist, graphical and interactive search tool +GIST_CONFIGURE_ENABLE= gist qt +GIST_USES= gl qt:5 +GIST_USE= gl=gl qt=core,gui,printsupport,widgets,qmake_build,buildtools_build + +PEAKHEAP_DESC= Peak heap size tracking +PEAKHEAP_CONFIGURE_ENABLE= peakheap + +PROFILE_DESC= Build with profiling information +PROFILE_CONFIGURE_ENABLE= profile + +SEARCH_DESC= Build search engines +SEARCH_CONFIGURE_ENABLE= search + +TEST_TARGET= check + +post-install: + ${STRIP_CMD} \ + ${STAGEDIR}${PREFIX}/lib/lib*.so.*.* + +post-install-FLATZINC-on: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/fzn-gecode + +post-install-FLATZINC-off: # https://github.com/Gecode/gecode/issues/108 + @cd ${STAGEDIR}${PREFIX} && ${RMDIR} share/minizinc/gecode share/minizinc/solvers share/minizinc + +test-extended: stage # breaks, see https://github.com/Gecode/gecode/issues/109 + @cd ${WRKSRC} && \ + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test && \ + LD_LIBRARY_PATH=${STAGEDIR}${PREFIX}/lib ./test/test -test -Float .include <bsd.port.mk> diff --git a/math/gecode/distinfo b/math/gecode/distinfo index 8f6b3dfa0c5e..bfeaa7ba3ea6 100644 --- a/math/gecode/distinfo +++ b/math/gecode/distinfo @@ -1,7 +1,5 @@ -TIMESTAMP = 1620335351 -SHA256 (Gecode-gecode-release-6.3.0-9428cd8_GH0.tar.gz) = 8605ee3644afb8b9821d98fd3b930a3e593c31d0b239d42446fbdbfc39bd935e -SIZE (Gecode-gecode-release-6.3.0-9428cd8_GH0.tar.gz) = 5725805 +TIMESTAMP = 1620507794 +SHA256 (Gecode-gecode-release-6.3.0-96ca4cc_GH0.tar.gz) = 0bfeed4c42019869fc275f4cf0aab782a83dfbb0cb5bf2573902d2cda2aec140 +SIZE (Gecode-gecode-release-6.3.0-96ca4cc_GH0.tar.gz) = 5727205 SHA256 (3b86d0dabc371d5976c5dafef0fc7f6c5f92640b.patch) = 20b69c28be015dea2826f66cab7079b30768d23af9b1d30d91bb6137e3c22227 SIZE (3b86d0dabc371d5976c5dafef0fc7f6c5f92640b.patch) = 665 -SHA256 (b8954e4e5a4c0faf65eb72d62f7e7b377bea14bb.patch) = bdcf1daa59bb82b92582b4aa0d1813a0c3b580b3d8ad1d9e1f28afc105f53e54 -SIZE (b8954e4e5a4c0faf65eb72d62f7e7b377bea14bb.patch) = 7628 diff --git a/math/gecode/pkg-plist b/math/gecode/pkg-plist index 0dd3b19c306d..16d0f63ee169 100644 --- a/math/gecode/pkg-plist +++ b/math/gecode/pkg-plist @@ -1,5 +1,7 @@ -bin/fzn-gecode +%%FLATZINC%%bin/fzn-gecode bin/mzn-gecode +include/examples/job-shop-instances.hpp +include/examples/scowl.hpp include/gecode/driver.hh include/gecode/driver/options.hpp include/gecode/driver/script.hpp @@ -10,7 +12,7 @@ include/gecode/flatzinc/branch.hpp include/gecode/flatzinc/conexpr.hh include/gecode/flatzinc/option.hh include/gecode/flatzinc/parser.hh -include/gecode/flatzinc/parser.tab.hpp +%%FLATZINC%%include/gecode/flatzinc/parser.tab.hpp include/gecode/flatzinc/plugin.hh include/gecode/flatzinc/registry.hh include/gecode/flatzinc/symboltable.hh @@ -695,75 +697,95 @@ include/gecode/third-party/boost/numeric/interval/transc.hpp include/gecode/third-party/boost/numeric/interval/utility.hpp include/gecode/third-party/boost/type.hpp lib/libgecodedriver.so -lib/libgecodeflatzinc.so -lib/libgecodefloat.so +lib/libgecodedriver.so.51 +lib/libgecodedriver.so.51.0 +%%FLATZINC%%lib/libgecodeflatzinc.so +%%FLATZINC%%lib/libgecodeflatzinc.so.51 +%%FLATZINC%%lib/libgecodeflatzinc.so.51.0 +%%FLATZINC%%lib/libgecodefloat.so +%%FLATZINC%%lib/libgecodefloat.so.51 +%%FLATZINC%%lib/libgecodefloat.so.51.0 %%GIST%%lib/libgecodegist.so +%%GIST%%lib/libgecodegist.so.51 +%%GIST%%lib/libgecodegist.so.51.0 lib/libgecodeint.so +lib/libgecodeint.so.51 +lib/libgecodeint.so.51.0 lib/libgecodekernel.so +lib/libgecodekernel.so.51 +lib/libgecodekernel.so.51.0 lib/libgecodeminimodel.so +lib/libgecodeminimodel.so.51 +lib/libgecodeminimodel.so.51.0 lib/libgecodesearch.so +lib/libgecodesearch.so.51 +lib/libgecodesearch.so.51.0 lib/libgecodeset.so +lib/libgecodeset.so.51 +lib/libgecodeset.so.51.0 lib/libgecodesupport.so -%%DATADIR%%/mznlib/fzn_all_different_int.mzn -%%DATADIR%%/mznlib/fzn_all_equal_int.mzn -%%DATADIR%%/mznlib/fzn_alldifferent_except_0.mzn -%%DATADIR%%/mznlib/fzn_among.mzn -%%DATADIR%%/mznlib/fzn_arg_max_bool.mzn -%%DATADIR%%/mznlib/fzn_arg_max_int.mzn -%%DATADIR%%/mznlib/fzn_arg_min_bool.mzn -%%DATADIR%%/mznlib/fzn_arg_min_int.mzn -%%DATADIR%%/mznlib/fzn_at_least_int.mzn -%%DATADIR%%/mznlib/fzn_at_least_set.mzn -%%DATADIR%%/mznlib/fzn_at_most_int.mzn -%%DATADIR%%/mznlib/fzn_at_most_set.mzn -%%DATADIR%%/mznlib/fzn_bin_packing.mzn -%%DATADIR%%/mznlib/fzn_bin_packing_capa.mzn -%%DATADIR%%/mznlib/fzn_bin_packing_load.mzn -%%DATADIR%%/mznlib/fzn_circuit.mzn -%%DATADIR%%/mznlib/fzn_count_eq.mzn -%%DATADIR%%/mznlib/fzn_count_eq_reif.mzn -%%DATADIR%%/mznlib/fzn_cumulative.mzn -%%DATADIR%%/mznlib/fzn_decreasing_bool.mzn -%%DATADIR%%/mznlib/fzn_decreasing_int.mzn -%%DATADIR%%/mznlib/fzn_diffn.mzn -%%DATADIR%%/mznlib/fzn_disjoint.mzn -%%DATADIR%%/mznlib/fzn_disjunctive_strict.mzn -%%DATADIR%%/mznlib/fzn_exactly_set.mzn -%%DATADIR%%/mznlib/fzn_global_cardinality.mzn -%%DATADIR%%/mznlib/fzn_global_cardinality_closed.mzn -%%DATADIR%%/mznlib/fzn_global_cardinality_low_up.mzn -%%DATADIR%%/mznlib/fzn_global_cardinality_low_up_closed.mzn -%%DATADIR%%/mznlib/fzn_increasing_bool.mzn -%%DATADIR%%/mznlib/fzn_increasing_int.mzn -%%DATADIR%%/mznlib/fzn_int_set_channel.mzn -%%DATADIR%%/mznlib/fzn_inverse.mzn -%%DATADIR%%/mznlib/fzn_inverse_set.mzn -%%DATADIR%%/mznlib/fzn_lex_less_bool.mzn -%%DATADIR%%/mznlib/fzn_lex_less_int.mzn -%%DATADIR%%/mznlib/fzn_lex_lesseq_bool.mzn -%%DATADIR%%/mznlib/fzn_lex_lesseq_int.mzn -%%DATADIR%%/mznlib/fzn_link_set_to_booleans.mzn -%%DATADIR%%/mznlib/fzn_member_bool.mzn -%%DATADIR%%/mznlib/fzn_member_bool_reif.mzn -%%DATADIR%%/mznlib/fzn_member_int.mzn -%%DATADIR%%/mznlib/fzn_member_int_reif.mzn -%%DATADIR%%/mznlib/fzn_nvalue.mzn -%%DATADIR%%/mznlib/fzn_partition_set.mzn -%%DATADIR%%/mznlib/fzn_range.mzn -%%DATADIR%%/mznlib/fzn_regular.mzn -%%DATADIR%%/mznlib/fzn_roots.mzn -%%DATADIR%%/mznlib/fzn_sort.mzn -%%DATADIR%%/mznlib/fzn_sum_pred.mzn -%%DATADIR%%/mznlib/fzn_sum_set.mzn -%%DATADIR%%/mznlib/fzn_table_bool.mzn -%%DATADIR%%/mznlib/fzn_table_bool_reif.mzn -%%DATADIR%%/mznlib/fzn_table_int.mzn -%%DATADIR%%/mznlib/fzn_table_int_reif.mzn -%%DATADIR%%/mznlib/fzn_value_precede_int.mzn -%%DATADIR%%/mznlib/fzn_value_precede_set.mzn -%%DATADIR%%/mznlib/gecode.mzn -%%DATADIR%%/mznlib/redefinitions-2.0.2.mzn -%%DATADIR%%/mznlib/redefinitions-2.0.mzn -%%DATADIR%%/mznlib/redefinitions-2.5.2.mzn -%%DATADIR%%/mznlib/redefinitions.mzn -share/minizinc/solvers/gecode.msc +lib/libgecodesupport.so.51 +lib/libgecodesupport.so.51.0 +%%FLATZINC%%%%DATADIR%%/fzn_all_different_int.mzn +%%FLATZINC%%%%DATADIR%%/fzn_all_equal_int.mzn +%%FLATZINC%%%%DATADIR%%/fzn_alldifferent_except_0.mzn +%%FLATZINC%%%%DATADIR%%/fzn_among.mzn +%%FLATZINC%%%%DATADIR%%/fzn_arg_max_bool.mzn +%%FLATZINC%%%%DATADIR%%/fzn_arg_max_int.mzn +%%FLATZINC%%%%DATADIR%%/fzn_arg_min_bool.mzn +%%FLATZINC%%%%DATADIR%%/fzn_arg_min_int.mzn +%%FLATZINC%%%%DATADIR%%/fzn_at_least_int.mzn +%%FLATZINC%%%%DATADIR%%/fzn_at_least_set.mzn +%%FLATZINC%%%%DATADIR%%/fzn_at_most_int.mzn +%%FLATZINC%%%%DATADIR%%/fzn_at_most_set.mzn +%%FLATZINC%%%%DATADIR%%/fzn_bin_packing.mzn +%%FLATZINC%%%%DATADIR%%/fzn_bin_packing_capa.mzn +%%FLATZINC%%%%DATADIR%%/fzn_bin_packing_load.mzn +%%FLATZINC%%%%DATADIR%%/fzn_circuit.mzn +%%FLATZINC%%%%DATADIR%%/fzn_count_eq.mzn +%%FLATZINC%%%%DATADIR%%/fzn_count_eq_reif.mzn +%%FLATZINC%%%%DATADIR%%/fzn_cumulative.mzn +%%FLATZINC%%%%DATADIR%%/fzn_decreasing_bool.mzn +%%FLATZINC%%%%DATADIR%%/fzn_decreasing_int.mzn +%%FLATZINC%%%%DATADIR%%/fzn_diffn.mzn +%%FLATZINC%%%%DATADIR%%/fzn_disjoint.mzn +%%FLATZINC%%%%DATADIR%%/fzn_disjunctive_strict.mzn +%%FLATZINC%%%%DATADIR%%/fzn_exactly_set.mzn +%%FLATZINC%%%%DATADIR%%/fzn_global_cardinality.mzn +%%FLATZINC%%%%DATADIR%%/fzn_global_cardinality_closed.mzn +%%FLATZINC%%%%DATADIR%%/fzn_global_cardinality_low_up.mzn +%%FLATZINC%%%%DATADIR%%/fzn_global_cardinality_low_up_closed.mzn +%%FLATZINC%%%%DATADIR%%/fzn_increasing_bool.mzn +%%FLATZINC%%%%DATADIR%%/fzn_increasing_int.mzn +%%FLATZINC%%%%DATADIR%%/fzn_int_set_channel.mzn +%%FLATZINC%%%%DATADIR%%/fzn_inverse.mzn +%%FLATZINC%%%%DATADIR%%/fzn_inverse_set.mzn +%%FLATZINC%%%%DATADIR%%/fzn_lex_less_bool.mzn +%%FLATZINC%%%%DATADIR%%/fzn_lex_less_int.mzn +%%FLATZINC%%%%DATADIR%%/fzn_lex_lesseq_bool.mzn +%%FLATZINC%%%%DATADIR%%/fzn_lex_lesseq_int.mzn +%%FLATZINC%%%%DATADIR%%/fzn_link_set_to_booleans.mzn +%%FLATZINC%%%%DATADIR%%/fzn_member_bool.mzn +%%FLATZINC%%%%DATADIR%%/fzn_member_bool_reif.mzn +%%FLATZINC%%%%DATADIR%%/fzn_member_int.mzn +%%FLATZINC%%%%DATADIR%%/fzn_member_int_reif.mzn +%%FLATZINC%%%%DATADIR%%/fzn_nvalue.mzn +%%FLATZINC%%%%DATADIR%%/fzn_partition_set.mzn +%%FLATZINC%%%%DATADIR%%/fzn_range.mzn +%%FLATZINC%%%%DATADIR%%/fzn_regular.mzn +%%FLATZINC%%%%DATADIR%%/fzn_roots.mzn +%%FLATZINC%%%%DATADIR%%/fzn_sort.mzn +%%FLATZINC%%%%DATADIR%%/fzn_sum_pred.mzn +%%FLATZINC%%%%DATADIR%%/fzn_sum_set.mzn +%%FLATZINC%%%%DATADIR%%/fzn_table_bool.mzn +%%FLATZINC%%%%DATADIR%%/fzn_table_bool_reif.mzn +%%FLATZINC%%%%DATADIR%%/fzn_table_int.mzn +%%FLATZINC%%%%DATADIR%%/fzn_table_int_reif.mzn +%%FLATZINC%%%%DATADIR%%/fzn_value_precede_int.mzn +%%FLATZINC%%%%DATADIR%%/fzn_value_precede_set.mzn +%%FLATZINC%%%%DATADIR%%/gecode.mzn +%%FLATZINC%%%%DATADIR%%/redefinitions-2.0.2.mzn +%%FLATZINC%%%%DATADIR%%/redefinitions-2.0.mzn +%%FLATZINC%%%%DATADIR%%/redefinitions-2.5.2.mzn +%%FLATZINC%%%%DATADIR%%/redefinitions.mzn +%%FLATZINC%%share/minizinc/solvers/gecode.msc diff --git a/math/minizinc/Makefile b/math/minizinc/Makefile index 6960c3cb83e4..df6501fa5527 100644 --- a/math/minizinc/Makefile +++ b/math/minizinc/Makefile @@ -1,6 +1,6 @@ PORTNAME= minizinc DISTVERSION= 2.5.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math lang MAINTAINER= yuri@FreeBSD.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105082257.148MvIlc037544>