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 s11-update
authorJohn Beck <John.Beck@Oracle.COM>
Mon, 16 Mar 2015 15:45:32 -0700
branchs11-update
changeset 3989 cc7f2e59f3c0
parent 3988 46ba69f31aed
child 3991 8b170efb5356
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	Mon Mar 16 09:20:05 2015 -0700
+++ b/components/fetchmail/Makefile	Mon Mar 16 15:45:32 2015 -0700
@@ -42,11 +42,18 @@
 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
 
+# 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 = \
+    $(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_32)
 
--- a/components/fetchmail/fetchmail.p5m	Mon Mar 16 09:20:05 2015 -0700
+++ b/components/fetchmail/fetchmail.p5m	Mon Mar 16 15:45:32 2015 -0700
@@ -42,12 +42,6 @@
 dir  path=usr/bin
 file path=usr/bin/fetchmail
 file path=usr/bin/fetchmailconf
-dir  path=usr/lib
-dir  path=usr/lib/python2.6
-dir  path=usr/lib/python2.6/vendor-packages
-file path=usr/lib/python2.6/vendor-packages/fetchmailconf.py
-file path=usr/lib/python2.6/vendor-packages/fetchmailconf.pyc
-file path=usr/lib/python2.6/vendor-packages/fetchmailconf.pyo
 dir  path=usr/share
 dir  path=usr/share/locale
 dir  path=usr/share/locale/ca
--- a/components/fetchmail/resolve.deps	Mon Mar 16 09:20:05 2015 -0700
+++ b/components/fetchmail/resolve.deps	Mon Mar 16 15:45:32 2015 -0700
@@ -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