comparison tool_dependencies.xml @ 4:9491d3c0dbe6 draft

Add --with-ensurepip
author jankanis
date Thu, 22 May 2014 11:01:04 -0400
parents d71cfcee2977
children fb4d95141633
comparison
equal deleted inserted replaced
3:d71cfcee2977 4:9491d3c0dbe6
11 <action type="set_environment_for_install"> 11 <action type="set_environment_for_install">
12 <repository changeset_revision="1c167e73d30f" name="package_openssl" owner="jankanis" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu"> 12 <repository changeset_revision="1c167e73d30f" name="package_openssl" owner="jankanis" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu">
13 <package name="openssl" version="1.0.1g" /> 13 <package name="openssl" version="1.0.1g" />
14 </repository> 14 </repository>
15 </action> 15 </action>
16 <!-- 16 <!--
17 Python3 config doesn't search for some optional dependencies 17 Python3 config doesn't search for some optional dependencies
18 in non-standard locations. Patch config.py to also look at 18 in non-standard locations. Patch config.py to also look at
19 the repositories we just installed above 19 the repositories we just installed above
20 --> 20 -->
21 <action type="shell_command"> 21 <action type="shell_command">
22 patch &lt;&lt; EOF 22 patch &lt;&lt; EOF
23 --- a/setup.py 23 --- a/setup.py
24 +++ b/setup.py 24 +++ b/setup.py
25 @@ -750,10 +750,14 @@ 25 @@ -750,10 +750,14 @@
26 exts.append( Extension('_socket', ['socketmodule.c'], 26 exts.append( Extension('_socket', ['socketmodule.c'],
27 depends = ['socketmodule.h']) ) 27 depends = ['socketmodule.h']) )
53 + ssl_libs = find_library_file(self.compiler, 'ssl', lib_dirs, search_for_ssl_libs_in) 53 + ssl_libs = find_library_file(self.compiler, 'ssl', lib_dirs, search_for_ssl_libs_in)
54 54
55 if (ssl_incs is not None and 55 if (ssl_incs is not None and
56 ssl_libs is not None): 56 ssl_libs is not None):
57 EOF 57 EOF
58 </action> 58 </action>
59 <action type="autoconf">--prefix=$INSTALL_DIR</action> 59 <action type="autoconf">--prefix=$INSTALL_DIR --with-ensurepip</action>
60 <action type="set_environment"> 60 <action type="set_environment">
61 <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/bin</environment_variable> 61 <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/bin</environment_variable>
62 <!-- empty PYTHONPATH, otherwise we will get Galaxy's Python 2 libraries in the Python 3 path--> 62 <!-- empty PYTHONPATH, otherwise we will get Galaxy's Python 2 libraries in the Python 3 path-->
63 <environment_variable action="set_to" name="PYTHONPATH" /> 63 <environment_variable action="set_to" name="PYTHONPATH" />
64 <environment_variable action="set_to" name="PYTHONHOME">$INSTALL_DIR</environment_variable> 64 <environment_variable action="set_to" name="PYTHONHOME">$INSTALL_DIR</environment_variable>
65 <environment_variable action="prepend_to" name="PKG_CONFIG_PATH">$INSTALL_DIR/lib/pkgconfig</environment_variable> 65 <environment_variable action="prepend_to" name="PKG_CONFIG_PATH">$INSTALL_DIR/lib/pkgconfig</environment_variable>
66 </action> 66 </action>
67 </actions> 67 </actions>
68 </install> 68 </install>
69 69
70 <readme> 70 <readme>