20657181 migrate git from Python 2.6 to 2.7 s11-update
authorJohn Beck <John.Beck@Oracle.COM>
Mon, 16 Mar 2015 13:40:16 -0700
branchs11-update
changeset 3983 59c8a3f84172
parent 3982 71d82a8cdf66
child 3984 03ec35f09e5b
20657181 migrate git from Python 2.6 to 2.7
components/git/Makefile
components/git/git.p5m
components/git/resolve.deps
--- a/components/git/Makefile	Mon Mar 16 16:43:06 2015 -0700
+++ b/components/git/Makefile	Mon Mar 16 13:40:16 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
@@ -46,11 +46,15 @@
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
 
+PYTHON_VERSION =	2.7
+
+PKG_MACROS +=		PYVER=$(PYTHON_VERSION)
+
 CONFIGURE_PREFIX    =	/usr
 CONFIGURE_OPTIONS  +=	--without-openssl
 CONFIGURE_OPTIONS  +=	--libexecdir=/usr/lib
 CONFIGURE_OPTIONS  +=	--with-perl=$(PERL)
-CONFIGURE_OPTIONS  +=	--with-python=$(PYTHON)
+CONFIGURE_OPTIONS  +=	--with-python=$(PYTHON.$(PYTHON_VERSION))
 CONFIGURE_OPTIONS  +=	CFLAGS="$(CFLAGS)"
 
 COMPONENT_BUILD_ENV+=	NO_PERL_MAKEMAKER=1
@@ -98,7 +102,6 @@
 	done
 	$(TOUCH) [email protected]
 
-
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
 include ../../make-rules/depend.mk
--- a/components/git/git.p5m	Mon Mar 16 16:43:06 2015 -0700
+++ b/components/git/git.p5m	Mon Mar 16 13:40:16 2015 -0700
@@ -224,27 +224,27 @@
 file path=usr/lib/git-core/mergetools/tortoisemerge
 file path=usr/lib/git-core/mergetools/vim
 file path=usr/lib/git-core/mergetools/xxdiff
-dir  path=usr/lib/python2.6
-dir  path=usr/lib/python2.6/vendor-packages
-dir  path=usr/lib/python2.6/vendor-packages/git_remote_helpers
-file path=usr/lib/python2.6/vendor-packages/git_remote_helpers-0.1.0-py2.6.egg-info
-file path=usr/lib/python2.6/vendor-packages/git_remote_helpers/__init__.py
-file path=usr/lib/python2.6/vendor-packages/git_remote_helpers/__init__.pyc
-dir  path=usr/lib/python2.6/vendor-packages/git_remote_helpers/git
-file path=usr/lib/python2.6/vendor-packages/git_remote_helpers/git/__init__.py
-file path=usr/lib/python2.6/vendor-packages/git_remote_helpers/git/__init__.pyc
-file path=usr/lib/python2.6/vendor-packages/git_remote_helpers/git/exporter.py
-file path=usr/lib/python2.6/vendor-packages/git_remote_helpers/git/exporter.pyc
-file path=usr/lib/python2.6/vendor-packages/git_remote_helpers/git/git.py
-file path=usr/lib/python2.6/vendor-packages/git_remote_helpers/git/git.pyc
-file path=usr/lib/python2.6/vendor-packages/git_remote_helpers/git/importer.py
-file path=usr/lib/python2.6/vendor-packages/git_remote_helpers/git/importer.pyc
-file path=usr/lib/python2.6/vendor-packages/git_remote_helpers/git/non_local.py
-file path=usr/lib/python2.6/vendor-packages/git_remote_helpers/git/non_local.pyc
-file path=usr/lib/python2.6/vendor-packages/git_remote_helpers/git/repo.py
-file path=usr/lib/python2.6/vendor-packages/git_remote_helpers/git/repo.pyc
-file path=usr/lib/python2.6/vendor-packages/git_remote_helpers/util.py
-file path=usr/lib/python2.6/vendor-packages/git_remote_helpers/util.pyc
+dir  path=usr/lib/python$(PYVER)
+dir  path=usr/lib/python$(PYVER)/vendor-packages
+dir  path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers
+file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers-0.1.0-py$(PYVER).egg-info
+file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/__init__.pyc
+dir  path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/git
+file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/git/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/git/__init__.pyc
+file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/git/exporter.py
+file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/git/exporter.pyc
+file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/git/git.py
+file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/git/git.pyc
+file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/git/importer.py
+file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/git/importer.pyc
+file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/git/non_local.py
+file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/git/non_local.pyc
+file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/git/repo.py
+file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/git/repo.pyc
+file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/util.py
+file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/util.pyc
 dir  path=usr/perl5
 dir  path=usr/perl5/vendor_perl
 dir  path=usr/perl5/vendor_perl/$(PERL_VERSION)
--- a/components/git/resolve.deps	Mon Mar 16 16:43:06 2015 -0700
+++ b/components/git/resolve.deps	Mon Mar 16 13:40:16 2015 -0700
@@ -1,7 +1,7 @@
 library/expat
 library/zlib
 runtime/perl-512
-runtime/python-26
+runtime/python-27
 shell/bash
 shell/ksh93
 system/library