diff options
author | Kai Knoblich <kai@FreeBSD.org> | 2020-12-24 13:46:01 +0000 |
---|---|---|
committer | Kai Knoblich <kai@FreeBSD.org> | 2020-12-24 13:46:01 +0000 |
commit | 9cb5898561b302d952fec8e2fac66a945a2c4915 (patch) | |
tree | 9274631a296b893d582fb8062e2f256a3a8c8d77 /math | |
parent | sysutils/xen-tools: switch to PYTHON_EXT_SUFFIX (diff) |
Relax hardcoded paths to fix build with Python 3.8.7
Since r558913 Python 3.8 incorporates BPO-42604 [1] which changed the
shared libs naming scheme. This means "EXT_SUFFIX" is now derived from
SOABI and yields with Python 3.8 to ".cpython-38.so" instead of ".so".
The affected ports strip the libaries in the "post-install" target via
hardcoded path(s) and the build fails at the end because the new extension
is not expected at this place.
Remedy the issue by adding wildcards to these paths. This should also
prepare the ports for future Python releases, which will use the new shared
libs naming scheme.
[1] https://bugs.python.org/issue42604
PR: 252057
Reported by: John Kennedy
Reviewed by: fluffy, koobs
Approved by: koobs (python)
Notes
Notes:
svn path=/head/; revision=559094
Diffstat (limited to 'math')
-rw-r--r-- | math/py-PySCIPOpt/Makefile | 2 | ||||
-rw-r--r-- | math/py-cdecimal/Makefile | 2 | ||||
-rw-r--r-- | math/py-cryptominisat/Makefile | 2 | ||||
-rw-r--r-- | math/py-cvxpy/Makefile | 2 | ||||
-rw-r--r-- | math/py-cyipopt/Makefile | 2 | ||||
-rw-r--r-- | math/py-fastcluster/Makefile | 2 | ||||
-rw-r--r-- | math/py-gmpy2/Makefile | 2 | ||||
-rw-r--r-- | math/py-graphillion/Makefile | 2 | ||||
-rw-r--r-- | math/py-hdmedians/Makefile | 2 | ||||
-rw-r--r-- | math/py-levmar/Makefile | 2 | ||||
-rw-r--r-- | math/py-libpoly/Makefile | 2 | ||||
-rw-r--r-- | math/py-numexpr/Makefile | 2 | ||||
-rw-r--r-- | math/py-numpy-stl/Makefile | 2 | ||||
-rw-r--r-- | math/py-pdal/Makefile | 6 | ||||
-rw-r--r-- | math/py-piranha/Makefile | 2 | ||||
-rw-r--r-- | math/py-pycosat/Makefile | 2 | ||||
-rw-r--r-- | math/py-pyhull/Makefile | 2 | ||||
-rw-r--r-- | math/py-pyipopt/Makefile | 2 | ||||
-rw-r--r-- | math/py-pynleq2/Makefile | 2 | ||||
-rw-r--r-- | math/py-python-fcl/Makefile | 2 | ||||
-rw-r--r-- | math/py-rpy2/Makefile | 2 | ||||
-rw-r--r-- | math/py-symcxx/Makefile | 2 | ||||
-rw-r--r-- | math/py-triangle/Makefile | 2 |
23 files changed, 25 insertions, 25 deletions
diff --git a/math/py-PySCIPOpt/Makefile b/math/py-PySCIPOpt/Makefile index 8ec1256912ca..66d71db149e7 100644 --- a/math/py-PySCIPOpt/Makefile +++ b/math/py-PySCIPOpt/Makefile @@ -17,6 +17,6 @@ USES= localbase python USE_PYTHON= distutils cython autoplist post-install: - @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/pyscipopt/scip.so + @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/pyscipopt/scip*.so .include <bsd.port.mk> diff --git a/math/py-cdecimal/Makefile b/math/py-cdecimal/Makefile index 445e6c880a24..567671d7c2d5 100644 --- a/math/py-cdecimal/Makefile +++ b/math/py-cdecimal/Makefile @@ -18,6 +18,6 @@ USES= python USE_PYTHON= distutils autoplist post-install: - @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/cdecimal.so + @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/cdecimal*.so .include <bsd.port.mk> diff --git a/math/py-cryptominisat/Makefile b/math/py-cryptominisat/Makefile index 5ecd85c1cd1a..ac582b9c742e 100644 --- a/math/py-cryptominisat/Makefile +++ b/math/py-cryptominisat/Makefile @@ -35,6 +35,6 @@ post-patch: ${CP} ${WRKSRC}/src/pycryptosat.cpp.in ${WRKSRC}/src/pycryptosat.cpp post-install: - ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/pycryptosat.so + ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/pycryptosat*.so .include <bsd.port.mk> diff --git a/math/py-cvxpy/Makefile b/math/py-cvxpy/Makefile index 6a0d7419a70e..b8b42a36b12b 100644 --- a/math/py-cvxpy/Makefile +++ b/math/py-cvxpy/Makefile @@ -23,6 +23,6 @@ USES= python:3.6+ USE_PYTHON= distutils autoplist post-install: - ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_cvxcore.so + ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_cvxcore*.so .include <bsd.port.mk> diff --git a/math/py-cyipopt/Makefile b/math/py-cyipopt/Makefile index 8de9fd3d71d9..e1b2803d0d24 100644 --- a/math/py-cyipopt/Makefile +++ b/math/py-cyipopt/Makefile @@ -28,6 +28,6 @@ GH_ACCOUNT= matthias-k USE_PYTHON= distutils cython autoplist post-install: - @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}.so + @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}*.so .include <bsd.port.mk> diff --git a/math/py-fastcluster/Makefile b/math/py-fastcluster/Makefile index 6a622584bd09..7020098ec52d 100644 --- a/math/py-fastcluster/Makefile +++ b/math/py-fastcluster/Makefile @@ -25,7 +25,7 @@ PORTDOCS= CITATION.txt INSTALL.txt NEWS.txt README.txt OPTIONS_DEFINE= DOCS post-install: - ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_fastcluster.so + ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_fastcluster*.so post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/math/py-gmpy2/Makefile b/math/py-gmpy2/Makefile index b70e9b47d873..b8b95c09a2fa 100644 --- a/math/py-gmpy2/Makefile +++ b/math/py-gmpy2/Makefile @@ -23,6 +23,6 @@ USE_PYTHON= distutils autoplist CONFLICTS= ${PYTHON_PKGNAMEPREFIX}gmpy2-devel-2.1* post-install: - @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/gmpy2.so + @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/gmpy2*.so .include <bsd.port.mk> diff --git a/math/py-graphillion/Makefile b/math/py-graphillion/Makefile index 031f67ff2abe..a541ac1aaec0 100644 --- a/math/py-graphillion/Makefile +++ b/math/py-graphillion/Makefile @@ -21,7 +21,7 @@ USES= python USE_PYTHON= distutils autoplist post-install: - ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_graphillion.so + ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_graphillion*.so do-test: @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test diff --git a/math/py-hdmedians/Makefile b/math/py-hdmedians/Makefile index a78f1bbb4103..20710127f2ca 100644 --- a/math/py-hdmedians/Makefile +++ b/math/py-hdmedians/Makefile @@ -19,6 +19,6 @@ USES= python USE_PYTHON= autoplist cython distutils post-install: - @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/hdmedians/geomedian.so + @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/hdmedians/geomedian*.so .include <bsd.port.mk> diff --git a/math/py-levmar/Makefile b/math/py-levmar/Makefile index c8e0f60581ad..9e332512ff15 100644 --- a/math/py-levmar/Makefile +++ b/math/py-levmar/Makefile @@ -27,7 +27,7 @@ post-patch: @${REINPLACE_CMD} -e 's|รถ|o|' ${WRKSRC}/AUTHORS # breaks because of non-ascii chars post-install: - @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/_${PORTNAME}.so + @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/_${PORTNAME}*.so do-test: @cd ${WRKSRC}/levmar/tests && ${PYTHON_CMD} -m pytest --pyargs levmar diff --git a/math/py-libpoly/Makefile b/math/py-libpoly/Makefile index 161b1b973229..34cc18e15f1c 100644 --- a/math/py-libpoly/Makefile +++ b/math/py-libpoly/Makefile @@ -27,7 +27,7 @@ BUILD_WRKSRC= ${WRKSRC}/python INSTALL_WRKSRC= ${WRKSRC}/python post-install: - ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/polypy.so + ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/polypy*.so do-build: @cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_BUILD_TARGET} ${PYDISTUTILS_BUILDARGS} diff --git a/math/py-numexpr/Makefile b/math/py-numexpr/Makefile index 01afd845e0d4..34984b6ec171 100644 --- a/math/py-numexpr/Makefile +++ b/math/py-numexpr/Makefile @@ -20,6 +20,6 @@ USES= dos2unix python USE_PYTHON= autoplist concurrent distutils post-install: - ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/numexpr/interpreter.so + ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/numexpr/interpreter*.so .include <bsd.port.mk> diff --git a/math/py-numpy-stl/Makefile b/math/py-numpy-stl/Makefile index 852e70ef9d99..4e7a0d2fd88a 100644 --- a/math/py-numpy-stl/Makefile +++ b/math/py-numpy-stl/Makefile @@ -21,6 +21,6 @@ USES= python:3.4+ USE_PYTHON= cython distutils autoplist post-install: - ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/stl/_speedups.so + ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/stl/_speedups*.so .include <bsd.port.mk> diff --git a/math/py-pdal/Makefile b/math/py-pdal/Makefile index 4ecf49f5e09a..34ffd61fcb46 100644 --- a/math/py-pdal/Makefile +++ b/math/py-pdal/Makefile @@ -24,9 +24,9 @@ USES= compiler:c++11-lang python:3.6+ USE_PYTHON= autoplist cython distutils post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpdal_plugin_filter_python.so - ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/libpdalpython.so - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpdal_plugin_reader_numpy.so + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpdal_plugin_filter_python*.so + ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/libpdalpython*.so + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpdal_plugin_reader_numpy*.so do-test: @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test diff --git a/math/py-piranha/Makefile b/math/py-piranha/Makefile index d75aabc42fe8..2b57ff8b9253 100644 --- a/math/py-piranha/Makefile +++ b/math/py-piranha/Makefile @@ -41,6 +41,6 @@ post-patch: # FIND_PACKAGE(Boost) only supports modules python and python3 @${REINPLACE_CMD} -e 's|$${REQUIRED_BOOST_LIBS} python)|$${REQUIRED_BOOST_LIBS} python${PYTHON_MAJOR_VER:S/2//})|' ${WRKSRC}/CMakeLists.txt post-install: - @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/pyranha/_core.so + @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/pyranha/_core*.so .include <bsd.port.mk> diff --git a/math/py-pycosat/Makefile b/math/py-pycosat/Makefile index 2b6d3021e907..0d4cdaf98a83 100644 --- a/math/py-pycosat/Makefile +++ b/math/py-pycosat/Makefile @@ -24,7 +24,7 @@ PYDISTUTILS_BUILDARGS= build_ext \ -lpicosat post-install: - ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/pycosat.so + ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/pycosat*.so do-test: @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test diff --git a/math/py-pyhull/Makefile b/math/py-pyhull/Makefile index 34adbd0c45d9..1e54355739bc 100644 --- a/math/py-pyhull/Makefile +++ b/math/py-pyhull/Makefile @@ -21,6 +21,6 @@ USES= python USE_PYTHON= autoplist distutils post-install: - @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/pyhull/_pyhull.so + @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/pyhull/_pyhull*.so .include <bsd.port.mk> diff --git a/math/py-pyipopt/Makefile b/math/py-pyipopt/Makefile index c5b7ed7bc924..e00503bad571 100644 --- a/math/py-pyipopt/Makefile +++ b/math/py-pyipopt/Makefile @@ -23,6 +23,6 @@ DOS2UNIX_FILES= setup.py USE_PYTHON= distutils autoplist post-install: - @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/pyipopt/pyipoptcore.so + @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/pyipopt/pyipoptcore*.so .include <bsd.port.mk> diff --git a/math/py-pynleq2/Makefile b/math/py-pynleq2/Makefile index 2eff2e16ec37..7eb7adb06547 100644 --- a/math/py-pynleq2/Makefile +++ b/math/py-pynleq2/Makefile @@ -35,6 +35,6 @@ pre-build: # compile fortran files into a static library because distutils fails ${AR} -qc libff.a ${FORTRAN_FILES:S/.f/.o/} post-install: - @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/nleq2.so + @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/nleq2*.so .include <bsd.port.mk> diff --git a/math/py-python-fcl/Makefile b/math/py-python-fcl/Makefile index 010c4bf37f0e..7b5e865c33f0 100644 --- a/math/py-python-fcl/Makefile +++ b/math/py-python-fcl/Makefile @@ -25,6 +25,6 @@ USE_PYTHON= distutils autoplist concurrent cython PYDISTUTILS_BUILD_TARGET= build_ext post-install: - ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/fcl/fcl.so + ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/fcl/fcl*.so .include <bsd.port.mk> diff --git a/math/py-rpy2/Makefile b/math/py-rpy2/Makefile index e7235f72e044..bf2c66b5e7ba 100644 --- a/math/py-rpy2/Makefile +++ b/math/py-rpy2/Makefile @@ -34,6 +34,6 @@ PLIST_FILES= ${PYTHON_SITELIBDIR}/__pycache__/_rinterface_cffi_abi.cpython-${PYT ${PYTHON_SITELIBDIR}/_rinterface_cffi_abi.py post-install: - ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_rinterface_cffi_api.abi3.so + ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_rinterface_cffi_api.abi3*.so .include <bsd.port.mk> diff --git a/math/py-symcxx/Makefile b/math/py-symcxx/Makefile index e9ac9e1ea221..f44c5c2bab6c 100644 --- a/math/py-symcxx/Makefile +++ b/math/py-symcxx/Makefile @@ -21,6 +21,6 @@ post-patch: @truncate -s 0 ${WRKSRC}/README.rst # workaround for https://github.com/bjodah/symcxx/issues/19 post-install: - @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/symcxx/_symcxx.so + @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/symcxx/_symcxx*.so .include <bsd.port.mk> diff --git a/math/py-triangle/Makefile b/math/py-triangle/Makefile index 979824537fd8..1289b08c1e18 100644 --- a/math/py-triangle/Makefile +++ b/math/py-triangle/Makefile @@ -19,6 +19,6 @@ USE_PYTHON= distutils autoplist BUILD_DEPENDS= triangle>0:math/triangle post-install: - ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/triangle/core.so + ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/triangle/core*.so .include <bsd.port.mk> |