diff options
| author | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2020-06-17 18:17:45 +0000 |
|---|---|---|
| committer | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2020-06-17 18:17:45 +0000 |
| commit | cb333cf1eccb98899b1700ca42a800ab92697fa4 (patch) | |
| tree | 7f623e7c3f52defb4424cb7124504b8d4e77d35c /math/cvc4 | |
| parent | e2a5e08ce3f52f8bff9eb487e88342c0ec9fff81 (diff) | |
| download | ports-cb333cf1eccb98899b1700ca42a800ab92697fa4.tar.gz ports-cb333cf1eccb98899b1700ca42a800ab92697fa4.zip | |
Move devel/swig30 to devel/swig and update to 4.0.1
- Do not silence installation message
- Update dependent ports:
- Fix build with swig 4.0.1
- Update *_DEPENDS
- Remove BINARY_ALIAS
Changes: http://www.swig.org/news.php
PR: 246613
Exp-run by: antoine
Notes
Notes:
svn path=/head/; revision=539491
Diffstat (limited to 'math/cvc4')
| -rw-r--r-- | math/cvc4/Makefile | 4 | ||||
| -rw-r--r-- | math/cvc4/files/patch-swig4 | 40 |
2 files changed, 42 insertions, 2 deletions
diff --git a/math/cvc4/Makefile b/math/cvc4/Makefile index abfe3c1d26dd..4f924d54ce79 100644 --- a/math/cvc4/Makefile +++ b/math/cvc4/Makefile @@ -56,10 +56,10 @@ JAVA_CMAKE_BOOL= BUILD_BINDINGS_JAVA JAVA_CMAKE_ON= -DJAVA_INCLUDE_PATH:PATH=${JAVA_HOME}/include \ -DJAVA_AWT_LIBRARY:PATH=${JAVA_HOME}/jre/lib/${ARCH}/libjawt.so \ -DJAVA_JVM_LIBRARY:PATH=${JAVA_HOME}/jre/lib/${ATCH}/libjava.so -JAVA_BUILD_DEPENDS= swig3.0:devel/swig30 +JAVA_BUILD_DEPENDS= swig:devel/swig PYTHON_CMAKE_BOOL= BUILD_BINDINGS_PYTHON USE_PYTHON3 -PYTHON_BUILD_DEPENDS= swig3.0:devel/swig30 +PYTHON_BUILD_DEPENDS= swig:devel/swig READLINE_CMAKE_BOOL= USE_READLINE READLINE_USES= readline:port diff --git a/math/cvc4/files/patch-swig4 b/math/cvc4/files/patch-swig4 new file mode 100644 index 000000000000..ca9a8faea594 --- /dev/null +++ b/math/cvc4/files/patch-swig4 @@ -0,0 +1,40 @@ +Obtained from: https://github.com/CVC4/CVC4/commit/c587235d29d2e3e1cd52a9f76dde8f58c89ae37e + +--- src/bindings/java/CMakeLists.txt.orig 2019-04-09 16:14:31 UTC ++++ src/bindings/java/CMakeLists.txt +@@ -131,6 +131,7 @@ set(gen_java_files + ${CMAKE_CURRENT_BINARY_DIR}/LastExceptionBuffer.java + ${CMAKE_CURRENT_BINARY_DIR}/LogicException.java + ${CMAKE_CURRENT_BINARY_DIR}/LogicInfo.java ++ ${CMAKE_CURRENT_BINARY_DIR}/Map_ExprExpr.java + ${CMAKE_CURRENT_BINARY_DIR}/ModalException.java + ${CMAKE_CURRENT_BINARY_DIR}/OptionException.java + ${CMAKE_CURRENT_BINARY_DIR}/Options.java +@@ -177,7 +178,6 @@ set(gen_java_files + ${CMAKE_CURRENT_BINARY_DIR}/SWIGTYPE_p_mpq_class.java + ${CMAKE_CURRENT_BINARY_DIR}/SWIGTYPE_p_mpz_class.java + ${CMAKE_CURRENT_BINARY_DIR}/SWIGTYPE_p_std__istream.java +- ${CMAKE_CURRENT_BINARY_DIR}/SWIGTYPE_p_std__mapT_CVC4__Expr_CVC4__Expr_t.java + ${CMAKE_CURRENT_BINARY_DIR}/SWIGTYPE_p_std__ostream.java + ${CMAKE_CURRENT_BINARY_DIR}/SWIGTYPE_p_std__shared_ptrT_CVC4__SygusPrintCallback_t.java + ${CMAKE_CURRENT_BINARY_DIR}/SWIGTYPE_p_std__string.java +@@ -210,6 +210,7 @@ set(gen_java_files + ${CMAKE_CURRENT_BINARY_DIR}/SygusPrintCallback.java + ${CMAKE_CURRENT_BINARY_DIR}/SymbolTable.java + ${CMAKE_CURRENT_BINARY_DIR}/SymbolType.java ++ ${CMAKE_CURRENT_BINARY_DIR}/SynthFunCommand.java + ${CMAKE_CURRENT_BINARY_DIR}/TesterType.java + ${CMAKE_CURRENT_BINARY_DIR}/TheoryId.java + ${CMAKE_CURRENT_BINARY_DIR}/Timer.java +--- src/smt/smt_engine.i.orig 2019-04-09 16:14:31 UTC ++++ src/smt/smt_engine.i +@@ -42,6 +42,9 @@ SWIGEXPORT void JNICALL Java_edu_nyu_acsys_CVC4_SmtEng + swigCPtr = 0; + } + } ++ ++%template(Map_ExprExpr) std::map<CVC4::Expr, CVC4::Expr>; ++ + #endif // SWIGJAVA + + %ignore CVC4::SmtEngine::setLogic(const char*); |