Date: Sun, 21 Mar 2021 08:34:16 +0000 (UTC) From: Kai Knoblich <kai@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r568906 - head/math/cadabra2 Message-ID: <202103210834.12L8YGNe092414@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kai Date: Sun Mar 21 08:34:16 2021 New Revision: 568906 URL: https://svnweb.freebsd.org/changeset/ports/568906 Log: math/cadabra2: Fix packaging with Python 3.8 and onward * Add a workaround to make the transition from Python 3.7 to Python 3.8 possible because the name of the .so file is slightly different between the two releases. PR: 254426 Approved by: yuri (maintainer) Modified: head/math/cadabra2/Makefile head/math/cadabra2/pkg-plist Modified: head/math/cadabra2/Makefile ============================================================================== --- head/math/cadabra2/Makefile Sun Mar 21 08:30:59 2021 (r568905) +++ head/math/cadabra2/Makefile Sun Mar 21 08:34:16 2021 (r568906) @@ -33,6 +33,8 @@ CMAKE_OFF= ENABLE_MATHEMATICA CXXFLAGS+= -I${LOCALBASE}/include/jsoncpp LDFLAGS+= -ljsoncpp +PLIST_SUB= _PY_SONAME=${_PY_SONAME} + OPTIONS_DEFINE= GUI OPTIONS_DEFAULT= GUI @@ -41,7 +43,15 @@ GUI_USE= GNOME=gtkmm30,gdkpixbuf2 GUI_CMAKE_BOOL= ENABLE_FRONTEND GUI_VARS= INSTALLS_ICONS=yes +.include <bsd.port.pre.mk> + +.if ${PYTHON_REL} < 3800 +_PY_SONAME= .cpython-${PYTHON_SUFFIX}m +.else +_PY_SONAME= ${PYTHON_EXT_SUFFIX} +.endif + post-extract: # unbundle @${RM} -r ${WRKSRC}/libs/jsoncpp ${WRKSRC}/libs/websocketpp -.include <bsd.port.mk> +.include <bsd.port.post.mk> Modified: head/math/cadabra2/pkg-plist ============================================================================== --- head/math/cadabra2/pkg-plist Sun Mar 21 08:30:59 2021 (r568905) +++ head/math/cadabra2/pkg-plist Sun Mar 21 08:34:16 2021 (r568906) @@ -7,7 +7,7 @@ bin/cadabra2html bin/cadabra2ipynb bin/cadabra2latex bin/cadabra2python -%%PYTHON_SITELIBDIR%%/cadabra2.cpython-%%PYTHON_SUFFIX%%m.so +%%PYTHON_SITELIBDIR%%/cadabra2%%_PY_SONAME%%.so %%PYTHON_SITELIBDIR%%/cadabra2_defaults.py %%PYTHON_SITELIBDIR%%/cadabra2_jupyter/__init__.py %%PYTHON_SITELIBDIR%%/cadabra2_jupyter/__main__.py
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103210834.12L8YGNe092414>