changeset 4:9491d3c0dbe6 draft

Add --with-ensurepip
author jankanis
date Thu, 22 May 2014 11:01:04 -0400
parents d71cfcee2977
children fb4d95141633
files tool_dependencies.xml
diffstat 1 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Thu May 22 10:52:19 2014 -0400
+++ b/tool_dependencies.xml	Thu May 22 11:01:04 2014 -0400
@@ -13,13 +13,13 @@
             <package name="openssl" version="1.0.1g" />
           </repository>
         </action>
-	<!--
-	 Python3 config doesn't search for some optional dependencies
-	 in non-standard locations. Patch config.py to also look at
-	 the repositories we just installed above
-	 -->
-	<action type="shell_command">
-	  patch &lt;&lt; EOF
+        <!--
+         Python3 config doesn't search for some optional dependencies
+         in non-standard locations. Patch config.py to also look at
+         the repositories we just installed above
+         -->
+        <action type="shell_command">
+          patch &lt;&lt; EOF
 --- a/setup.py
 +++ b/setup.py
 @@ -750,10 +750,14 @@
@@ -55,14 +55,14 @@
          if (ssl_incs is not None and
              ssl_libs is not None):
 EOF
-	</action>
-        <action type="autoconf">--prefix=$INSTALL_DIR</action>
+        </action>
+        <action type="autoconf">--prefix=$INSTALL_DIR --with-ensurepip</action>
         <action type="set_environment">
           <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/bin</environment_variable>
           <!-- empty PYTHONPATH, otherwise we will get Galaxy's Python 2 libraries in the Python 3 path-->
           <environment_variable action="set_to" name="PYTHONPATH" />
           <environment_variable action="set_to" name="PYTHONHOME">$INSTALL_DIR</environment_variable>
-	  <environment_variable action="prepend_to" name="PKG_CONFIG_PATH">$INSTALL_DIR/lib/pkgconfig</environment_variable>
+          <environment_variable action="prepend_to" name="PKG_CONFIG_PATH">$INSTALL_DIR/lib/pkgconfig</environment_variable>
         </action>
       </actions>
     </install>