Fix building internal modules for Python 3.8; clean-ups

This commit is contained in:
adam 2019-12-15 14:42:26 +00:00
parent 74dfa9ebb8
commit d5cba11cdd
5 changed files with 6 additions and 14 deletions

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.39 2019/11/02 15:38:09 rillig Exp $
# $NetBSD: Makefile,v 1.40 2019/12/15 14:42:27 adam Exp $
PKGNAME= ${PYPKGPREFIX}-gdbm-${PY_DISTVERSION}
PKGREVISION= 1
@ -19,7 +19,6 @@ GDBM_MODNAME= gdbm
EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/${GDBM_MODNAME}module.c
PYDISTUTILSPKG= yes
PY_PATCHPLIST= yes
PY_SETUP_SUBST+= GDBMPREFIX=${BUILDLINK_PREFIX.gdbm}
PY_SETUP_SUBST+= GDBM_MODNAME=${GDBM_MODNAME}

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.49 2019/12/12 10:43:32 markd Exp $
# $NetBSD: Makefile,v 1.50 2019/12/15 14:42:27 adam Exp $
PKGNAME= ${PYPKGPREFIX}-curses-${PY_DISTVERSION}
PKGREVISION= 5
@ -29,11 +29,6 @@ do-patch:
done
.include "../../lang/python/extension.mk"
.if ${_PYTHON_VERSION} >= 38
EXTRACT_ELEMENTS+= ${PYSUBDIR}/Modules/clinic
.endif
.include "../../lang/python/srcdist.mk"
.include "../../mk/curses.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.32 2019/11/03 10:18:27 rillig Exp $
# $NetBSD: Makefile,v 1.33 2019/12/15 14:42:27 adam Exp $
PKGNAME= ${PYPKGPREFIX}-cursespanel-${PY_DISTVERSION}
PKGREVISION= 4
@ -15,7 +15,6 @@ FAKE_NCURSES= yes
EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/_curses_panel.c
PYDISTUTILSPKG= yes
PY_PATCHPLIST= yes
PY_SETUP_SUBST= NCURSESPREFIX=${BUILDLINK_PREFIX.ncurses}
PYSETUPINSTALLARGS+= --install-lib ${PREFIX}/${PYLIB}/lib-dynload

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.33 2019/11/03 10:18:29 rillig Exp $
# $NetBSD: Makefile,v 1.34 2019/12/15 14:42:26 adam Exp $
PKGNAME= ${PYPKGPREFIX}-readline-${PY_DISTVERSION}
CATEGORIES= devel misc python
@ -12,7 +12,6 @@ EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/readline.c
USE_GCC_RUNTIME= yes
PYDISTUTILSPKG= yes
PY_PATCHPLIST= yes
PY_SETUP_SUBST+= RLPREFIX=${BUILDLINK_PREFIX.readline}
PY_SETUP_SUBST+= RLRTPREFIX=${BUILDLINK_PREFIX.readline}
PYSETUPINSTALLARGS+= --install-lib ${PREFIX}/${PYLIB}/lib-dynload

View file

@ -1,4 +1,4 @@
# $NetBSD: srcdist.mk,v 1.38 2019/06/05 13:44:17 sjmulder Exp $
# $NetBSD: srcdist.mk,v 1.39 2019/12/15 14:42:26 adam Exp $
.include "../../lang/python/pyversion.mk"
@ -11,7 +11,7 @@ WRKSRC= ${WRKDIR}/${PYSUBDIR}
# This is used for standard modules shipped with Python but build as
# separate packages.
. if ${PYVERSSUFFIX} == "3.5" || ${PYVERSSUFFIX} == "3.6" || ${PYVERSSUFFIX} == "3.7"
. if ${_PYTHON_VERSION} != 27
EXTRACT_ELEMENTS+= ${PYSUBDIR}/Modules/clinic
. endif