git: 889aaf267174 - main - math/{,py-}spot: Minor improvements
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 10 Oct 2022 19:05:38 UTC
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=889aaf267174fcd1b96776227f99266c28e91783 commit 889aaf267174fcd1b96776227f99266c28e91783 Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2022-10-10 14:41:44 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2022-10-10 19:05:35 +0000 math/{,py-}spot: Minor improvements * Allow to test the Python binding from math/spot * Remove unnecessary patch * Correct C++ standard level --- math/py-spot/Makefile | 4 +++- math/spot/Makefile | 4 ++++ math/spot/files/patch-spot_misc_tmpfile.cc | 10 ---------- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/math/py-spot/Makefile b/math/py-spot/Makefile index eda5daa20cc3..6471569047e9 100644 --- a/math/py-spot/Makefile +++ b/math/py-spot/Makefile @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libspot.so:math/spot -USES= compiler:c++14-lang gmake libtool python:3.4+ +USES= compiler:c++17-lang gmake libtool python:3.4+ GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-python --disable-static @@ -35,4 +35,6 @@ post-configure: post-install: @${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} -name "*.so" | ${XARGS} ${STRIP_CMD} +# to test: cd ../spot && make test WITH_PYTHON=yes + .include <bsd.port.mk> diff --git a/math/spot/Makefile b/math/spot/Makefile index 5c46eacd16f0..39020795ff02 100644 --- a/math/spot/Makefile +++ b/math/spot/Makefile @@ -14,7 +14,11 @@ USES= charsetfix compiler:c++17-lang gmake libtool USE_LDCONFIG= yes GNU_CONFIGURE= yes +.if !defined(WITH_PYTHON) # math/py-spot is a separate port but tests don't work there. To test run: make test WITH_PYTHON=yes CONFIGURE_ARGS= --disable-python --disable-static +.else +CONFIGURE_ARGS= --disable-static +.endif INSTALL_TARGET= install-strip diff --git a/math/spot/files/patch-spot_misc_tmpfile.cc b/math/spot/files/patch-spot_misc_tmpfile.cc deleted file mode 100644 index 063d33233e71..000000000000 --- a/math/spot/files/patch-spot_misc_tmpfile.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- spot/misc/tmpfile.cc.orig 2022-10-08 19:11:32 UTC -+++ spot/misc/tmpfile.cc -@@ -23,6 +23,7 @@ - #include <stdlib.h> - #include <unistd.h> - #include <string.h> -+#include <stdlib.h> - - using namespace std::string_literals; -