Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
20657181 migrate git from Python 2.6 to 2.7
authorJohn Beck <John.Beck@Oracle.COM>
Thu, 05 Mar 2015 14:44:01 -0800
changeset 3913 6975b8339adc
parent 3912 c5e09b550970
child 3914 0919f4d30271
20657181 migrate git from Python 2.6 to 2.7
components/git/Makefile file | annotate | diff | comparison | revisions
components/git/git.p5m file | annotate | diff | comparison | revisions 
--- a/components/git/Makefile	Thu Mar 05 13:53:57 2015 -0800
+++ b/components/git/Makefile	Thu Mar 05 14:44:01 2015 -0800
@@ -46,6 +46,10 @@
 include $(WS_MAKE_RULES)/configure.mk
 include $(WS_MAKE_RULES)/ips.mk
 
+PYTHON_VERSION =	2.7
+
+PKG_MACROS +=		PYVER=$(PYTHON_VERSION)
+
 CONFIGURE_BINDIR.64 =	$(CONFIGURE_PREFIX)/bin
 CONFIGURE_LIBDIR.64 =	$(CONFIGURE_PREFIX)/lib
 
@@ -53,7 +57,7 @@
 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)"
 
 # Build fails if environment variable PROFILE is set.
@@ -110,12 +114,10 @@
 	done
 	$(TOUCH) $@
 
-
-
 REQUIRED_PACKAGES += library/expat
 REQUIRED_PACKAGES += library/zlib
 REQUIRED_PACKAGES += runtime/perl-512
-REQUIRED_PACKAGES += runtime/python-26
+REQUIRED_PACKAGES += runtime/python-27
 REQUIRED_PACKAGES += shell/bash
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/library
--- a/components/git/git.p5m	Thu Mar 05 13:53:57 2015 -0800
+++ b/components/git/git.p5m	Thu Mar 05 14:44:01 2015 -0800
@@ -219,23 +219,23 @@
 file path=usr/lib/git-core/mergetools/tortoisemerge
 file path=usr/lib/git-core/mergetools/vim
 file path=usr/lib/git-core/mergetools/xxdiff
-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
-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
+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
+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
 file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/Error.pm
 file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/Git.pm
 file path=usr/share/git-core/templates/description
upstream/oracle/userland-gate