summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Rosenfeld <hans.rosenfeld@joyent.com>2017-06-14 14:12:35 +0200
committerHans Rosenfeld <hans.rosenfeld@joyent.com>2017-06-19 12:32:43 +0200
commit6fdad3b6ca717b24ef6300f9cfc7c52e0f1e6814 (patch)
treeb2c4d78d71a97d7ed9a3cef8d0d98d4ee4238c52
parent037850e3a141e499934dd9e6a1c908ccc16bf3cd (diff)
downloadillumos-gfx-drm-6fdad3b6ca717b24ef6300f9cfc7c52e0f1e6814.tar.gz
8401 support python 2.7 for userland-fetch
Reviewed by: Gordon Ross <gordon.w.ross@gmail.com> Reviewed by: Alexander Pyhalov <alp@rsu.ru>
-rw-r--r--usr/src/Makefile.master5
-rw-r--r--usr/src/common/libdrm/Makefile2
2 files changed, 4 insertions, 3 deletions
diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master
index fb862de..ce9e1fa 100644
--- a/usr/src/Makefile.master
+++ b/usr/src/Makefile.master
@@ -165,8 +165,9 @@ PERL_VERSION= 5.10.0
PERL_PKGVERS= -510
PERL_ARCH = i86pc-solaris-64int
$(SPARC_BLD)PERL_ARCH = sun4-solaris-64int
-PYTHON_26= /usr/bin/python2.6
-PYTHON= $(PYTHON_26)
+PYTHON_VERSION= 2.7
+PYTHON_PKGVERS= -27
+PYTHON= /usr/bin/python$(PYTHON_VERSION)
SORT= /usr/bin/sort
TOUCH= /usr/bin/touch
WC= /usr/bin/wc
diff --git a/usr/src/common/libdrm/Makefile b/usr/src/common/libdrm/Makefile
index d34093d..8da266a 100644
--- a/usr/src/common/libdrm/Makefile
+++ b/usr/src/common/libdrm/Makefile
@@ -19,7 +19,7 @@
include $(SRC)/Makefile.master
-FETCH= $(SRC)/tools/userland-fetch
+FETCH= $(PYTHON) $(SRC)/tools/userland-fetch
# See also: ./Makefile.drm LIBDRM_VERS and ./Check-patches
# PLEASE RUN Check-patches after updating!