Date: Wed, 3 Mar 2021 11:33:15 +0000 (UTC) From: Dima Panov <fluffy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r567072 - in head/databases: ldb20 ldb21 ldb22 Message-ID: <202103031133.123BXF9q098846@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: fluffy Date: Wed Mar 3 11:33:15 2021 New Revision: 567072 URL: https://svnweb.freebsd.org/changeset/ports/567072 Log: databases/ldb2[012]: Unbreak build with python3.8+ PR: 253815 Approved by: python Modified: head/databases/ldb20/Makefile head/databases/ldb21/Makefile head/databases/ldb22/Makefile Modified: head/databases/ldb20/Makefile ============================================================================== --- head/databases/ldb20/Makefile Wed Mar 3 11:29:50 2021 (r567071) +++ head/databases/ldb20/Makefile Wed Mar 3 11:33:15 2021 (r567072) @@ -106,14 +106,14 @@ BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/manpag USES+= python:build,test CONFIGURE_ARGS+= --disable-python .else -USES+= python:3.4+ +USES+= gettext-runtime python:3.6+ PLIST_FILES+= include/pyldb.h \ - lib/libpyldb-util.so \ - lib/libpyldb-util.so.2 \ - ${PYTHON_SITELIBDIR}/ldb.so \ + lib/libpyldb-util${PYTHON_EXT_SUFFIX}.so \ + lib/libpyldb-util${PYTHON_EXT_SUFFIX}.so.2 \ + ${PYTHON_SITELIBDIR}/ldb${PYTHON_EXT_SUFFIX}.so \ ${PYTHON_SITELIBDIR}/_ldb_text.py \ - ${PKGCONFIGDIR}/pyldb-util.pc + ${PKGCONFIGDIR}/pyldb-util${PYTHON_EXT_SUFFIX}.pc .endif # No fancy color error messages @@ -158,8 +158,8 @@ post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${lib} .endfor .if ${PORT_OPTIONS:MPYTHON3} && !defined(NO_PYTHON) - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpyldb-util.so - ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ldb.so + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpyldb-util*.so + ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ldb*.so .endif .include <bsd.port.post.mk> Modified: head/databases/ldb21/Makefile ============================================================================== --- head/databases/ldb21/Makefile Wed Mar 3 11:29:50 2021 (r567071) +++ head/databases/ldb21/Makefile Wed Mar 3 11:33:15 2021 (r567072) @@ -106,14 +106,14 @@ BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/manpag USES+= python:build,test CONFIGURE_ARGS+= --disable-python .else -USES+= python:3.4+ gettext-runtime +USES+= gettext-runtime python:3.6+ PLIST_FILES+= include/pyldb.h \ - lib/libpyldb-util.so \ - lib/libpyldb-util.so.2 \ - ${PYTHON_SITELIBDIR}/ldb.so \ + lib/libpyldb-util${PYTHON_EXT_SUFFIX}.so \ + lib/libpyldb-util${PYTHON_EXT_SUFFIX}.so.2 \ + ${PYTHON_SITELIBDIR}/ldb${PYTHON_EXT_SUFFIX}.so \ ${PYTHON_SITELIBDIR}/_ldb_text.py \ - ${PKGCONFIGDIR}/pyldb-util.pc + ${PKGCONFIGDIR}/pyldb-util${PYTHON_EXT_SUFFIX}.pc .endif # No fancy color error messages @@ -158,8 +158,8 @@ post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${lib} .endfor .if ${PORT_OPTIONS:MPYTHON3} && !defined(NO_PYTHON) - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpyldb-util.so - ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ldb.so + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpyldb-util*.so + ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ldb*.so .endif .include <bsd.port.post.mk> Modified: head/databases/ldb22/Makefile ============================================================================== --- head/databases/ldb22/Makefile Wed Mar 3 11:29:50 2021 (r567071) +++ head/databases/ldb22/Makefile Wed Mar 3 11:33:15 2021 (r567072) @@ -108,14 +108,14 @@ BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/manpag USES+= python:build,test CONFIGURE_ARGS+= --disable-python .else -USES+= python:3.4+ gettext-runtime +USES+= gettext-runtime python:3.6+ PLIST_FILES+= include/pyldb.h \ - lib/libpyldb-util.so \ - lib/libpyldb-util.so.2 \ - ${PYTHON_SITELIBDIR}/ldb.so \ + lib/libpyldb-util${PYTHON_EXT_SUFFIX}.so \ + lib/libpyldb-util${PYTHON_EXT_SUFFIX}.so.2 \ + ${PYTHON_SITELIBDIR}/ldb${PYTHON_EXT_SUFFIX}.so \ ${PYTHON_SITELIBDIR}/_ldb_text.py \ - ${PKGCONFIGDIR}/pyldb-util.pc + ${PKGCONFIGDIR}/pyldb-util${PYTHON_EXT_SUFFIX}.pc .endif # No fancy color error messages @@ -160,8 +160,8 @@ post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${lib} .endfor .if ${PORT_OPTIONS:MPYTHON3} && !defined(NO_PYTHON) - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpyldb-util.so - ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ldb.so + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpyldb-util*.so + ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ldb*.so .endif .include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103031133.123BXF9q098846>