diff tool_dependencies.xml @ 6:321cacd4ae43 draft

Add dependencies and settings for sqlite and gdbm, so that python can build its packages for those.
author jankanis
date Fri, 23 May 2014 08:44:18 -0400
parents fb4d95141633
children 34e257e3aceb
line wrap: on
line diff
--- a/tool_dependencies.xml	Thu May 22 11:14:11 2014 -0400
+++ b/tool_dependencies.xml	Fri May 23 08:44:18 2014 -0400
@@ -1,9 +1,18 @@
 <?xml version="1.0"?>
 <tool_dependency>
   <package name="openssl" version="1.0.1g">
-    <repository changeset_revision="23ebff671a20" name="package_openssl" owner="jankanis" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu" />
+    <repository changeset_revision="23ebff671a20" name="package_openssl" owner="jankanis" toolshed="http://toolshed.g2.bx.psu.edu" />
   </package>
 
+  <package name="sqlite" version="3.8.3">
+    <repository changeset_revision="706b1f3b1fc0" name="package_sqlite_3_8_3" owner="iuc" toolshed="http://toolshed.g2.bx.psu.edu" />
+  </package>
+
+  <package name="gdbm" version="1.11">
+    <repository changeset_revision="15e7435c2663" name="package_gdbm_1_11" owner="iuc" toolshed="http://toolshed.g2.bx.psu.edu" />
+  </package>
+
+  
   <package name="python3" version="3.4.1">
     <install version="1.0">
       <actions>
@@ -12,54 +21,24 @@
           <repository changeset_revision="23ebff671a20" name="package_openssl" owner="jankanis" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu">
             <package name="openssl" version="1.0.1g" />
           </repository>
+          <repository changeset_revision="706b1f3b1fc0" name="package_sqlite_3_8_3" owner="iuc" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu">
+            <package name="sqlite" version="3.8.3" />
+          </repository>
+          <repository changeset_revision="15e7435c2663" name="package_gdbm_1_11" owner="iuc" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu">
+            <package name="gdbm" version="1.11" />
+          </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
---- a/setup.py
-+++ b/setup.py
-@@ -750,10 +750,14 @@
-         exts.append( Extension('_socket', ['socketmodule.c'],
-                                depends = ['socketmodule.h']) )
-         # Detect SSL support for the socket module (via _ssl)
-+        CUSTOM_OPENSSL = os.environ.get('OPENSSL_ROOT_DIR')
-         search_for_ssl_incs_in = [
-                               '/usr/local/ssl/include',
-                               '/usr/contrib/ssl/include/'
-                              ]
-+        if CUSTOM_OPENSSL:
-+            search_for_ssl_incs_in.append(os.path.join(CUSTOM_OPENSSL, 'include'))
-+        
-         ssl_incs = find_file('openssl/ssl.h', inc_dirs,
-                              search_for_ssl_incs_in
-                              )
-@@ -762,10 +766,12 @@
-                                ['/usr/kerberos/include'])
-             if krb5_h:
-                 ssl_incs += krb5_h
--        ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
--                                     ['/usr/local/ssl/lib',
--                                      '/usr/contrib/ssl/lib/'
--                                     ] )
-+
-+        search_for_ssl_libs_in = ['/usr/local/ssl/lib',
-+                                  '/usr/contrib/ssl/lib/']
-+        if CUSTOM_OPENSSL:
-+            search_for_ssl_libs_in.append(os.path.join(CUSTOM_OPENSSL, 'lib'))
-+        ssl_libs = find_library_file(self.compiler, 'ssl', lib_dirs, search_for_ssl_libs_in)
- 
-         if (ssl_incs is not None and
-             ssl_libs is not None):
-EOF
-        </action>
-        <action type="autoconf">--prefix=$INSTALL_DIR --with-ensurepip</action>
+
+	<action type="set_environment">
+	  <environment_variable action="set_to" name="CFLAGS">$CFLAGS -I$SQLITE_ROOT_DIR/lib -I$GDBM_ROOT_PATH/lib -I$OPENSSL_ROOT_DIR/lib</environment_variable>
+	  <environment_variable action="set_to" name="CPPFLAGS">$CPPFLAGS -I$SQLITE_ROOT_DIR/lib -I$GDBM_ROOT_PATH/lib -I$OPENSSL_ROOT_DIR/lib</environment_variable>
+	  <environment_variable action="set_to" name="LDFLAGS">$LDFLAGS -L$SQLITE_ROOT_DIR/include -L$GDBM_ROOT_PATH/include -L$OPENSSL_ROOT_DIR/include</environment_variable>
+	</action>
+
+        <action type="autoconf">--prefix=$INSTALL_DIR --with-ensurepip --enable-loadable-sqlite-extensions</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-->
+          <!-- 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>