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 /net | |
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 'net')
-rw-r--r-- | net/py-confluent-kafka/Makefile | 2 | ||||
-rw-r--r-- | net/py-ldap/Makefile | 2 | ||||
-rw-r--r-- | net/py-ldap0/Makefile | 2 | ||||
-rw-r--r-- | net/py-libfte/Makefile | 2 | ||||
-rw-r--r-- | net/py-maxminddb/Makefile | 2 | ||||
-rw-r--r-- | net/py-miniupnpc/Makefile | 2 | ||||
-rw-r--r-- | net/py-mpi4py/Makefile | 2 | ||||
-rw-r--r-- | net/py-netifaces/Makefile | 2 | ||||
-rw-r--r-- | net/py-pcapy/Makefile | 2 | ||||
-rw-r--r-- | net/py-pyenet/Makefile | 2 | ||||
-rw-r--r-- | net/py-pypcap/Makefile | 2 | ||||
-rw-r--r-- | net/py-pysendfile/Makefile | 2 | ||||
-rw-r--r-- | net/py-radix/Makefile | 2 |
13 files changed, 13 insertions, 13 deletions
diff --git a/net/py-confluent-kafka/Makefile b/net/py-confluent-kafka/Makefile index 050a9983d7d2..87b6c2eacd52 100644 --- a/net/py-confluent-kafka/Makefile +++ b/net/py-confluent-kafka/Makefile @@ -21,6 +21,6 @@ USES= localbase python USE_PYTHON= autoplist distutils post-install: - ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/confluent_kafka/cimpl.so + ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/confluent_kafka/cimpl*.so .include <bsd.port.mk> diff --git a/net/py-ldap/Makefile b/net/py-ldap/Makefile index e3c9fea0c6d9..cdc4698de6a6 100644 --- a/net/py-ldap/Makefile +++ b/net/py-ldap/Makefile @@ -35,6 +35,6 @@ do-configure-SASL-off: @cd ${WRKSRC} && ${PYTHON_CMD} setup.py -q saveopts post-install: - ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_ldap.so + ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_ldap*.so .include <bsd.port.mk> diff --git a/net/py-ldap0/Makefile b/net/py-ldap0/Makefile index 7f3cd86657d1..6a2c3605dd48 100644 --- a/net/py-ldap0/Makefile +++ b/net/py-ldap0/Makefile @@ -36,7 +36,7 @@ TEST_ENV= LDAPNOINIT=1 \ TMP=${WRKDIR} post-install: - ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_libldap0.so + ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_libldap0*.so do-test: @cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test diff --git a/net/py-libfte/Makefile b/net/py-libfte/Makefile index a3a808d78b00..bc551683d8ca 100644 --- a/net/py-libfte/Makefile +++ b/net/py-libfte/Makefile @@ -28,6 +28,6 @@ post-extract: ${RM} ${WRKSRC}/setup.cfg post-install: - ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/fte/cDFA.so + ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/fte/cDFA*.so .include <bsd.port.mk> diff --git a/net/py-maxminddb/Makefile b/net/py-maxminddb/Makefile index bc93b0dec37c..cc36440e6c0e 100644 --- a/net/py-maxminddb/Makefile +++ b/net/py-maxminddb/Makefile @@ -24,6 +24,6 @@ GH_PROJECT= MaxMind-DB-Reader-python USE_PYTHON= autoplist distutils post-install: - ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/maxminddb/extension.so + ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/maxminddb/extension*.so .include <bsd.port.mk> diff --git a/net/py-miniupnpc/Makefile b/net/py-miniupnpc/Makefile index 57782d20c410..9e154370346f 100644 --- a/net/py-miniupnpc/Makefile +++ b/net/py-miniupnpc/Makefile @@ -18,6 +18,6 @@ MAKE_ENV= MAKE=gmake PLIST= post-install: - ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/miniupnpc.so + ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/miniupnpc*.so .include "${MASTERDIR}/Makefile" diff --git a/net/py-mpi4py/Makefile b/net/py-mpi4py/Makefile index ab88caeaa825..f2cb7f9440be 100644 --- a/net/py-mpi4py/Makefile +++ b/net/py-mpi4py/Makefile @@ -45,7 +45,7 @@ do-install-MANPAGES-on: @${ECHO} man/man1/mpi4py.1.gz >> ${TMPPLIST} post-install: - @cd ${STAGEDIR}${PYTHON_SITELIBDIR}/mpi4py && ${STRIP_CMD} dl.so MPI.so lib-pmpi/libvt-hyb.so lib-pmpi/libvt.so lib-pmpi/libvt-mpi.so lib-pmpi/libmpe.so + @cd ${STAGEDIR}${PYTHON_SITELIBDIR}/mpi4py && ${STRIP_CMD} dl*.so MPI*.so lib-pmpi/libvt-hyb*.so lib-pmpi/libvt*.so lib-pmpi/libvt-mpi*.so lib-pmpi/libmpe*.so do-test: # tests fail with MPICH2=on: https://bitbucket.org/mpi4py/mpi4py/issues/110/tests-fail-with-mpich2-on-freebsd-error diff --git a/net/py-netifaces/Makefile b/net/py-netifaces/Makefile index d832969b7f61..0e6c68e2d4cc 100644 --- a/net/py-netifaces/Makefile +++ b/net/py-netifaces/Makefile @@ -16,6 +16,6 @@ USES= python USE_PYTHON= autoplist distutils post-install: - ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/netifaces.so + ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/netifaces*.so .include <bsd.port.mk> diff --git a/net/py-pcapy/Makefile b/net/py-pcapy/Makefile index 2dec2368c5f4..bfa61f84545f 100644 --- a/net/py-pcapy/Makefile +++ b/net/py-pcapy/Makefile @@ -22,7 +22,7 @@ PORTDOCS= README pcapy.html OPTIONS_DEFINE= DOCS post-install: - @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/pcapy.so + @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/pcapy*.so post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/net/py-pyenet/Makefile b/net/py-pyenet/Makefile index 673ed7ca0e90..2fe0a1fbd829 100644 --- a/net/py-pyenet/Makefile +++ b/net/py-pyenet/Makefile @@ -19,6 +19,6 @@ USES= python USE_PYTHON= autoplist cython distutils post-install: - @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/enet.so + @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/enet*.so .include <bsd.port.mk> diff --git a/net/py-pypcap/Makefile b/net/py-pypcap/Makefile index 4e7bd86ab493..e2a35309f118 100644 --- a/net/py-pypcap/Makefile +++ b/net/py-pypcap/Makefile @@ -23,6 +23,6 @@ pre-configure: cd ${WRKSRC} && cython-${PYTHON_VER} pcap.pyx post-install: - ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/pcap.so + ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/pcap*.so .include <bsd.port.mk> diff --git a/net/py-pysendfile/Makefile b/net/py-pysendfile/Makefile index 95a9881d98cd..c759c095629d 100644 --- a/net/py-pysendfile/Makefile +++ b/net/py-pysendfile/Makefile @@ -20,6 +20,6 @@ USES= python USE_PYTHON= distutils autoplist post-install: - @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/sendfile.so + @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/sendfile*.so .include <bsd.port.mk> diff --git a/net/py-radix/Makefile b/net/py-radix/Makefile index 80a7ae230ee5..2fb98a7a0468 100644 --- a/net/py-radix/Makefile +++ b/net/py-radix/Makefile @@ -18,6 +18,6 @@ USES= python USE_PYTHON= distutils autoplist post-install: - ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/_${PORTNAME}.so + ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/_${PORTNAME}*.so .include <bsd.port.mk> |