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.
20062980 fetchmailconf should move to Python 2.7
authorJohn Beck <John.Beck@Oracle.COM>
Wed, 19 Nov 2014 13:37:23 -0800
changeset 2217 8878794c871e
parent 2216 d2f9e9b12fff
child 2218 399aeeee867d
20062980 fetchmailconf should move to Python 2.7
components/fetchmail/Makefile file | annotate | diff | comparison | revisions
components/fetchmail/fetchmail.p5m file | annotate | diff | comparison | revisions
components/fetchmail/resolve.deps file | annotate | diff | comparison | revisions 
--- a/components/fetchmail/Makefile	Wed Nov 19 11:30:51 2014 -0700
+++ b/components/fetchmail/Makefile	Wed Nov 19 13:37:23 2014 -0800
@@ -42,19 +42,19 @@
 include ../../make-rules/ips.mk
 
 CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
-CONFIGURE_OPTIONS  +=		am_cv_python_pythondir="$(PYTHON_VENDOR_PACKAGES)"
+CONFIGURE_OPTIONS  +=		PYTHON="$(PYTHON.2.7.32)"
 CONFIGURE_OPTIONS  +=		--with-kerberos5
 CONFIGURE_OPTIONS  +=		--with-ssl
 CONFIGURE_OPTIONS  +=		--enable-NTLM
 
-# We don't have any .so files, so we want to ship the .py and .pyc files in
-# the same place as we would for 32-bit.
-PYTHON_VENDOR_PACKAGES.64 =	$(PYTHON_VENDOR_PACKAGES.32)
-
 ASLR_MODE = $(ASLR_ENABLE)
 
+# Change the shebang line to use Python 2.7 explicitly, and drop the
+# fixed file into /usr/bin, where our package manifest expects it.
 COMPONENT_POST_INSTALL_ACTION = \
-    $(PYTHON) -m compileall $(PROTO_DIR)/$(PYTHON_VENDOR_PACKAGES)
+    $(GSED) -e "s|/usr/bin/env python|$(PYTHON.2.7.32)|" \
+	$(PROTO_DIR)/usr/lib/python2.7/site-packages/fetchmailconf.py > \
+	$(PROTO_DIR)$(USRBIN.32)/fetchmailconf
 
 # common targets
 build:		$(BUILD_64)
--- a/components/fetchmail/fetchmail.p5m	Wed Nov 19 11:30:51 2014 -0700
+++ b/components/fetchmail/fetchmail.p5m	Wed Nov 19 13:37:23 2014 -0800
@@ -37,10 +37,7 @@
 set name=org.opensolaris.arc-caseid value=PSARC/2008/135
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 file usr/bin/$(MACH64)/fetchmail path=usr/bin/fetchmail
-file usr/bin/$(MACH64)/fetchmailconf path=usr/bin/fetchmailconf
-file path=usr/lib/python2.6/vendor-packages/fetchmailconf.py \
-    pkg.tmp.autopyc=false
-file path=usr/lib/python2.6/vendor-packages/fetchmailconf.pyc
+file path=usr/bin/fetchmailconf
 file path=usr/share/locale/ca/LC_MESSAGES/fetchmail.mo
 file path=usr/share/locale/cs/LC_MESSAGES/fetchmail.mo
 file path=usr/share/locale/da/LC_MESSAGES/fetchmail.mo
--- a/components/fetchmail/resolve.deps	Wed Nov 19 11:30:51 2014 -0700
+++ b/components/fetchmail/resolve.deps	Wed Nov 19 13:37:23 2014 -0800
@@ -1,7 +1,6 @@
-library/python-2/tkinter-26
-library/python/tkinter-26
+library/python/tkinter-27
 library/security/openssl
-runtime/python-26
+runtime/python-27
 service/security/kerberos-5
 shell/ksh93
 system/library
upstream/oracle/userland-gate