From owner-svn-ports-all@freebsd.org Wed Mar 3 11:33:16 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 71791567B0A; Wed, 3 Mar 2021 11:33:16 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DrBhD2ryyz3MBZ; Wed, 3 Mar 2021 11:33:16 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5506577F; Wed, 3 Mar 2021 11:33:16 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 123BXGQw098849; Wed, 3 Mar 2021 11:33:16 GMT (envelope-from fluffy@FreeBSD.org) Received: (from fluffy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 123BXF9q098846; Wed, 3 Mar 2021 11:33:15 GMT (envelope-from fluffy@FreeBSD.org) Message-Id: <202103031133.123BXF9q098846@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fluffy set sender to fluffy@FreeBSD.org using -f From: Dima Panov Date: Wed, 3 Mar 2021 11:33:15 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: fluffy X-SVN-Commit-Paths: in head/databases: ldb20 ldb21 ldb22 X-SVN-Commit-Revision: 567072 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Mar 2021 11:33:16 -0000 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 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 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