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 /databases | |
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 'databases')
-rw-r--r-- | databases/py-PyGreSQL/Makefile | 2 | ||||
-rw-r--r-- | databases/py-apsw/Makefile | 2 | ||||
-rw-r--r-- | databases/py-asyncpg/Makefile | 2 | ||||
-rw-r--r-- | databases/py-bsddb3/Makefile | 2 | ||||
-rw-r--r-- | databases/py-cassandra-driver/Makefile | 2 | ||||
-rw-r--r-- | databases/py-leveldb/Makefile | 2 | ||||
-rw-r--r-- | databases/py-lmdb/Makefile | 2 | ||||
-rw-r--r-- | databases/py-peewee/Makefile | 2 | ||||
-rw-r--r-- | databases/py-pglast/Makefile | 2 | ||||
-rw-r--r-- | databases/py-psycopg2/Makefile | 2 | ||||
-rw-r--r-- | databases/py-pylibmc/Makefile | 2 | ||||
-rw-r--r-- | databases/py-pymssql/Makefile | 4 | ||||
-rw-r--r-- | databases/py-pyodbc/Makefile | 2 | ||||
-rw-r--r-- | databases/py-sqlite3/Makefile | 2 | ||||
-rw-r--r-- | databases/py-sqlrelay/Makefile | 2 |
15 files changed, 16 insertions, 16 deletions
diff --git a/databases/py-PyGreSQL/Makefile b/databases/py-PyGreSQL/Makefile index 53d53f0adb87..c942a467b707 100644 --- a/databases/py-PyGreSQL/Makefile +++ b/databases/py-PyGreSQL/Makefile @@ -22,7 +22,7 @@ PORTDOCS= * OPTIONS_DEFINE= DOCS post-install: - ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_pg.so + ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_pg*.so @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/docs/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) diff --git a/databases/py-apsw/Makefile b/databases/py-apsw/Makefile index e141d1f131d4..522de682699e 100644 --- a/databases/py-apsw/Makefile +++ b/databases/py-apsw/Makefile @@ -19,7 +19,7 @@ USES= localbase python sqlite:3 zip USE_PYTHON= autoplist concurrent distutils post-install: - ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/apsw.so + ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/apsw*.so do-test: cd ${WRKSRC}/ && ${PYTHON_CMD} setup.py test diff --git a/databases/py-asyncpg/Makefile b/databases/py-asyncpg/Makefile index b1003cedd1a6..a4a28285c10c 100644 --- a/databases/py-asyncpg/Makefile +++ b/databases/py-asyncpg/Makefile @@ -20,7 +20,7 @@ OPTIONS_DEFINE= DOCS PORTDOCS= PKG-INFO README.rst post-install: - ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/asyncpg/protocol/protocol.so + ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/asyncpg/protocol/protocol*.so post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR}/ diff --git a/databases/py-bsddb3/Makefile b/databases/py-bsddb3/Makefile index 87ba6d8851c8..217951c1f3f7 100644 --- a/databases/py-bsddb3/Makefile +++ b/databases/py-bsddb3/Makefile @@ -34,6 +34,6 @@ post-patch: post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} @(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}) - @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/bsddb3/_pybsddb.so + @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/bsddb3/_pybsddb*.so .include <bsd.port.mk> diff --git a/databases/py-cassandra-driver/Makefile b/databases/py-cassandra-driver/Makefile index 749e01dd7c90..93ad94863b6a 100644 --- a/databases/py-cassandra-driver/Makefile +++ b/databases/py-cassandra-driver/Makefile @@ -29,7 +29,7 @@ MURMUR3_DESC= Enable murmur3 extension OPTIONS_DEFAULT= LIBEV MURMUR3 LIBEV_LIB_DEPENDS= libev.so:devel/libev -LIBEV_VARS= STRIPFILES=${STAGEDIR}${PYTHON_SITELIBDIR}/cassandra/io/libevwrapper.so +LIBEV_VARS= STRIPFILES=${STAGEDIR}${PYTHON_SITELIBDIR}/cassandra/io/libevwrapper*.so LIBEV_VARS_OFF= PYDISTUTILS_BUILDARGS+=--no-libev PYDISTUTILS_INSTALLARGS+=--no-libev MURMUR3_VARS_OFF= PYDISTUTILS_BUILDARGS+=--no-murmur3 PYDISTUTILS_INSTALLARGS+=--no-murmur3 diff --git a/databases/py-leveldb/Makefile b/databases/py-leveldb/Makefile index 951a3ac2503c..3ae4c9092410 100644 --- a/databases/py-leveldb/Makefile +++ b/databases/py-leveldb/Makefile @@ -23,6 +23,6 @@ post-patch: @${RM} -r ${WRKSRC}/leveldb/ ${WRKSRC}/snappy/ post-install: - ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/leveldb.so + ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/leveldb*.so .include <bsd.port.mk> diff --git a/databases/py-lmdb/Makefile b/databases/py-lmdb/Makefile index d1d781c98e9e..245e3031b853 100644 --- a/databases/py-lmdb/Makefile +++ b/databases/py-lmdb/Makefile @@ -26,7 +26,7 @@ MAKE_ENV= LMDB_FORCE_SYSTEM=1 \ LMDB_FORCE_CFFI=1 post-install: - @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/lmdb/lmdb_cffi.so + @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/lmdb/lmdb_cffi*.so do-test: @cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -rs -v diff --git a/databases/py-peewee/Makefile b/databases/py-peewee/Makefile index 5113695c38a8..4d6d94435ce4 100644 --- a/databases/py-peewee/Makefile +++ b/databases/py-peewee/Makefile @@ -25,7 +25,7 @@ MYSQL_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.3:databases/py-MySQLdb@ PGSQL_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.1:databases/py-psycopg2@${PY_FLAVOR} post-install: - @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/playhouse/_speedups.so + @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/playhouse/_speedups*.so do-test: ${PYTHON_CMD} ${WRKSRC}/runtests.py diff --git a/databases/py-pglast/Makefile b/databases/py-pglast/Makefile index a4ac9876b73e..2facdc91a47f 100644 --- a/databases/py-pglast/Makefile +++ b/databases/py-pglast/Makefile @@ -23,6 +23,6 @@ post-patch: @${REINPLACE_CMD} -e 's|make|gmake|' ${WRKSRC}/setup.py post-install: - ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/pglast/parser.so + ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/pglast/parser*.so .include <bsd.port.mk> diff --git a/databases/py-psycopg2/Makefile b/databases/py-psycopg2/Makefile index 23bce2786716..0759322c7ae0 100644 --- a/databases/py-psycopg2/Makefile +++ b/databases/py-psycopg2/Makefile @@ -17,6 +17,6 @@ USES= pgsql python USE_PYTHON= autoplist concurrent distutils post-install: - ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/psycopg2/_psycopg.so + ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/psycopg2/_psycopg*.so .include <bsd.port.mk> diff --git a/databases/py-pylibmc/Makefile b/databases/py-pylibmc/Makefile index b4f7957c47fb..868ecc5a22e9 100644 --- a/databases/py-pylibmc/Makefile +++ b/databases/py-pylibmc/Makefile @@ -23,7 +23,7 @@ USE_PYTHON= autoplist distutils MAKE_ENV+= LIBMEMCACHED="${LOCALBASE}" post-install: - ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_pylibmc.so + ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_pylibmc*.so # Note: memcached needs to be running first for this to work diff --git a/databases/py-pymssql/Makefile b/databases/py-pymssql/Makefile index b9bd8203d79c..168c6005a47d 100644 --- a/databases/py-pymssql/Makefile +++ b/databases/py-pymssql/Makefile @@ -22,7 +22,7 @@ post-extract: @${RM} ${WRKSRC}/_mssql.c post-install: - @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_mssql.so \ - ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/pymssql.so + @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_mssql*.so \ + ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/pymssql*.so .include <bsd.port.mk> diff --git a/databases/py-pyodbc/Makefile b/databases/py-pyodbc/Makefile index 731358ca5156..5ca31942a393 100644 --- a/databases/py-pyodbc/Makefile +++ b/databases/py-pyodbc/Makefile @@ -20,6 +20,6 @@ USES= localbase python USE_PYTHON= autoplist distutils post-install: - @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/pyodbc.so + @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/pyodbc*.so .include <bsd.port.mk> diff --git a/databases/py-sqlite3/Makefile b/databases/py-sqlite3/Makefile index 5b835a9e1b73..be761e9c88dd 100644 --- a/databases/py-sqlite3/Makefile +++ b/databases/py-sqlite3/Makefile @@ -38,6 +38,6 @@ post-extract: .endif post-install: - ${STRIP_CMD} ${STAGEDIR}${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so + ${STRIP_CMD} ${STAGEDIR}${PYTHON_LIBDIR}/lib-dynload/_sqlite3*.so .include <bsd.port.post.mk> diff --git a/databases/py-sqlrelay/Makefile b/databases/py-sqlrelay/Makefile index 0cb4eec4e9a1..f7dd8800c9ff 100644 --- a/databases/py-sqlrelay/Makefile +++ b/databases/py-sqlrelay/Makefile @@ -36,6 +36,6 @@ post-patch: ${WRKSRC}/configure post-install: - ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/SQLRelay/CSQLRelay.so + ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/SQLRelay/CSQLRelay*.so .include <bsd.port.mk> |