Remove python2 FLAVOR, migrate to python3 by default

Briefly discussed with jca@ and espie@
This commit is contained in:
bket 2020-02-27 18:15:25 +00:00
parent 5430063e2d
commit 38c3cfecfd
3 changed files with 7 additions and 9 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.173 2020/02/09 18:48:29 martin Exp $
# $OpenBSD: Makefile,v 1.174 2020/02/27 18:15:25 bket Exp $
SUBDIR =
SUBDIR += R
@ -57,7 +57,6 @@
SUBDIR += mcsim
SUBDIR += minisat
SUBDIR += mlpack
SUBDIR += mlpack,
SUBDIR += moo
SUBDIR += muparser
SUBDIR += netcdf

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.13 2019/11/18 13:05:58 cwen Exp $
# $OpenBSD: Makefile,v 1.14 2020/02/27 18:15:25 bket Exp $
BROKEN-powerpc = virtual memory exhausted, even with -O1
@ -7,7 +7,7 @@ COMMENT-python = python bindings to C++ machine learning library
V = 3.2.1
REVISION-main = 1
REVISION-python = 0
REVISION-python = 1
# STB stuff
# XXX remember to bump REV if they change
@ -53,8 +53,8 @@ WANTLIB-python = ${WANTLIB} ${MODPY_WANTLIB} boost_serialization mlpack
MODULES = devel/cmake \
lang/python
FLAVOR ?= python3
FLAVORS = python3
FLAVOR = python3
MODPY_RUNDEP = No
@ -73,9 +73,6 @@ LIB_DEPENDS-python = math/mlpack,-main \
RUN_DEPENDS-python = math/py-pandas${MODPY_FLAVOR}
# XXX set this *explicitly*, do not depend on module order
CONFIGURE_STYLE = cmake

View File

@ -1,6 +1,8 @@
@comment $OpenBSD: PLIST-python,v 1.5 2019/10/28 15:13:35 espie Exp $
@comment $OpenBSD: PLIST-python,v 1.6 2020/02/27 18:15:25 bket Exp $
@conflict mlpack-<3.0.4
@conflict py-mlpack-*
@pkgpath math/mlpack,-python${FLAVOR_EXT}
@pkgpath math/mlpack,
include/mlpack/bindings/python/
include/mlpack/bindings/python/get_arma_type.hpp
include/mlpack/bindings/python/get_cython_type.hpp