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.
19714339 Python 3.4 utilities use incorrect shebang path s11-update
authorJohn Beck <John.Beck@Oracle.COM>
Wed, 01 Oct 2014 13:17:07 -0700
branchs11-update
changeset 3784 d6eabdbf55cb
parent 3783 9edbfb2ff34a
child 3785 6a3f91179f05
19714339 Python 3.4 utilities use incorrect shebang path
components/pylint/pylint-GENFRAG.p5m file | annotate | diff | comparison | revisions
components/pylint/pylint-PYVER.p5m file | annotate | diff | comparison | revisions
components/python/python34/Makefile file | annotate | diff | comparison | revisions
components/python/python34/python-34.p5m file | annotate | diff | comparison | revisions 
--- a/components/python/python34/Makefile	Wed Feb 04 07:11:04 2015 -0800
+++ b/components/python/python34/Makefile	Wed Oct 01 13:17:07 2014 -0700
@@ -103,6 +103,7 @@
 CONFIGURE_OPTIONS  +=		--without-gcc
 CONFIGURE_OPTIONS  +=		--without-ensurepip
 CONFIGURE_OPTIONS  +=		--enable-ipv6
+CONFIGURE_OPTIONS  +=		--bindir=/usr/bin
 CONFIGURE_OPTIONS  +=		CPPFLAGS="$(CPPFLAGS)"
 CONFIGURE_OPTIONS  +=		LDFLAGS="$(LDFLAGS)"
 CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
--- a/components/python/python34/python-34.p5m	Wed Feb 04 07:11:04 2015 -0800
+++ b/components/python/python34/python-34.p5m	Wed Oct 01 13:17:07 2014 -0700
@@ -47,22 +47,22 @@
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
 link path=usr/bin/2to3 target=2to3-3.4 mediator=python mediator-version=3.4
-file usr/bin/$(MACH64)/2to3-3.4 path=usr/bin/2to3-3.4
+file path=usr/bin/2to3-3.4
 link path=usr/bin/idle target=idle3.4 mediator=python mediator-version=3.4
-file usr/bin/$(MACH64)/idle3.4 path=usr/bin/idle3.4
+file path=usr/bin/idle3.4
 link path=usr/bin/pydoc target=pydoc3.4 mediator=python mediator-version=3.4
-file usr/bin/$(MACH64)/pydoc3.4 path=usr/bin/pydoc3.4
+file path=usr/bin/pydoc3.4
 link path=usr/bin/python target=python3.4 mediator=python mediator-version=3.4
 link path=usr/bin/python-config target=python3.4-config mediator=python \
     mediator-version=3.4
 hardlink path=usr/bin/python3.4 target=python3.4m
-file usr/bin/$(MACH64)/python3.4m path=usr/bin/python3.4m
+file path=usr/bin/python3.4m
 link path=usr/bin/python3.4-config target=python3.4m-config
-file usr/bin/$(MACH64)/python3.4m-config path=usr/bin/python3.4m-config
+file path=usr/bin/python3.4m-config
 # pyvenv is new in 3.x, so no need for a mediator now, but one will be needed
 # when we add 3.5 .
 link path=usr/bin/pyvenv target=pyvenv-3.4
-file usr/bin/$(MACH64)/pyvenv-3.4 path=usr/bin/pyvenv-3.4
+file path=usr/bin/pyvenv-3.4
 #
 file path=usr/include/python3.4m/Python-ast.h
 file path=usr/include/python3.4m/Python.h
upstream/oracle/userland-gate