Mon Sep 30 11:37:04 2019 UTC ()
Python 3 using meson can build python 2 using packages, so remove
restriction, and just pick 3.7 out of a hat as the version for meson
as a build tool to use.


(prlw1)
diff -r1.12 -r1.13 pkgsrc/devel/py-meson/build.mk
cvs diff -r1.12 -r1.13 pkgsrc/devel/py-meson/Attic/build.mk (expand / switch to unified diff)

--- pkgsrc/devel/py-meson/Attic/build.mk 2019/08/23 15:42:55 1.12
+++ pkgsrc/devel/py-meson/Attic/build.mk 2019/09/30 11:37:04 1.13
@@ -1,29 +1,27 @@ @@ -1,29 +1,27 @@
1# $NetBSD: build.mk,v 1.12 2019/08/23 15:42:55 nia Exp $ 1# $NetBSD: build.mk,v 1.13 2019/09/30 11:37:04 prlw1 Exp $
2 2
3BUILD_DEPENDS+= ${PYPKGPREFIX}-meson-[0-9]*:../../devel/py-meson 3BUILD_DEPENDS+= py37-meson-[0-9]*:../../devel/py-meson
4 4
5.PHONY: meson-configure meson-build meson-install 5.PHONY: meson-configure meson-build meson-install
6 6
7# pkgsrc contains multiple llvm-config executables at multiple locations. 7# pkgsrc contains multiple llvm-config executables at multiple locations.
8.if !empty(LLVM_CONFIG_PATH) 8.if !empty(LLVM_CONFIG_PATH)
9MAKE_ENV+= LLVM_CONFIG_PATH=${LLVM_CONFIG_PATH:Q} 9MAKE_ENV+= LLVM_CONFIG_PATH=${LLVM_CONFIG_PATH:Q}
10.endif 10.endif
11 11
12do-configure: meson-configure 12do-configure: meson-configure
13meson-configure: 13meson-configure:
14 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} meson --prefix ${PREFIX} --libdir lib --mandir ${PKGMANDIR} --sysconfdir ${PKG_SYSCONFDIR} --buildtype=plain ${MESON_ARGS} . output 14 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} meson --prefix ${PREFIX} --libdir lib --mandir ${PKGMANDIR} --sysconfdir ${PKG_SYSCONFDIR} --buildtype=plain ${MESON_ARGS} . output
15 15
16do-build: meson-build 16do-build: meson-build
17meson-build: 17meson-build:
18 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ninja -j ${MAKE_JOBS:U1} -C output 18 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ninja -j ${MAKE_JOBS:U1} -C output
19 19
20do-install: meson-install 20do-install: meson-install
21meson-install: 21meson-install:
22 if [ -f ${WRKSRC}/meson_post_install.py ]; then \ 22 if [ -f ${WRKSRC}/meson_post_install.py ]; then \
23 ${CHMOD} +x ${WRKSRC}/meson_post_install.py; \ 23 ${CHMOD} +x ${WRKSRC}/meson_post_install.py; \
24 fi 24 fi
25 cd ${WRKSRC} && ${SETENV} ${INSTALL_ENV} ${MAKE_ENV} ninja -C output install 25 cd ${WRKSRC} && ${SETENV} ${INSTALL_ENV} ${MAKE_ENV} ninja -C output install
26 26
27PYTHON_VERSIONS_INCOMPATIBLE= 27 
28 
29.include "../../lang/python/application.mk" 27.include "../../lang/python/application.mk"