CVS commit: pkgsrc/sysutils/u-boot

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Jun 21 10:06:53 UTC 2020

Modified Files:
        pkgsrc/sysutils/u-boot: u-boot.mk

Log Message:
u-boot: make previous more agnostic to python-3.x version


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/sysutils/u-boot/u-boot.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/u-boot/u-boot.mk
diff -u pkgsrc/sysutils/u-boot/u-boot.mk:1.28 pkgsrc/sysutils/u-boot/u-boot.mk:1.29
--- pkgsrc/sysutils/u-boot/u-boot.mk:1.28       Sat Jun 20 22:26:15 2020
+++ pkgsrc/sysutils/u-boot/u-boot.mk    Sun Jun 21 10:06:53 2020
@@ -1,4 +1,4 @@
-# $NetBSD: u-boot.mk,v 1.28 2020/06/20 22:26:15 thorpej Exp $
+# $NetBSD: u-boot.mk,v 1.29 2020/06/21 10:06:53 wiz Exp $
 
 .include "../../sysutils/u-boot/u-boot-version.mk"
 
@@ -13,8 +13,11 @@ HOMEPAGE?=   https://www.denx.de/wiki/U-Bo
 MASTER_SITES?= ftp://ftp.denx.de/pub/u-boot/
 
 .if !empty(UBOOT_VERSION:M202[0-9].*)
-PYTHON_VERSIONS_ACCEPTED= 37
+PYTHON_VERSIONS_INCOMPATIBLE=  27
 UBOOT_SWIG_VERSION=    3
+.else
+UBOOT_SWIG_VERSION=    3
+PYTHON_VERSIONS_ACCEPTED?=     27
 .endif
 
 TOOL_DEPENDS+= dtc>=1.4.2:../../sysutils/dtc
@@ -30,13 +33,12 @@ LICENSE=    gnu-gpl-v2
 USE_LANGUAGES=         c c++
 USE_TOOLS+=            bison gmake gsed pkg-config gawk
 PYTHON_FOR_BUILD_ONLY= yes
-PYTHON_VERSIONS_ACCEPTED?=     27
 .include "../../lang/python/tool.mk"
 
-.if !empty(_PYTHON_VERSION_37_OK:M)
-ALL_ENV+=              PYTHON3=${PYTHONBIN} PYTHONCONFIG=${PYTHONCONFIG}
-.else
+.if ${PYPKGPREFIX} == "py27"
 ALL_ENV+=              PYTHON2=${PYTHONBIN} PYTHONCONFIG=${PYTHONCONFIG}
+.else
+ALL_ENV+=              PYTHON3=${PYTHONBIN} PYTHONCONFIG=${PYTHONCONFIG}
 .endif
 ALL_ENV+=              PYTHONLIBPATH=-L$(LOCALBASE)/lib