# HG changeset patch # User jankanis # Date 1400849058 14400 # Node ID 321cacd4ae43d3002efd5bac586b0314e4f3168d # Parent fb4d951416334298a648e3ef7d1454538db82ffa Add dependencies and settings for sqlite and gdbm, so that python can build its packages for those. diff -r fb4d95141633 -r 321cacd4ae43 tool_dependencies.xml --- 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 @@ - + + + + + + + + + + @@ -12,54 +21,24 @@ + + + + + + - - - patch << 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 - - --prefix=$INSTALL_DIR --with-ensurepip + + + $CFLAGS -I$SQLITE_ROOT_DIR/lib -I$GDBM_ROOT_PATH/lib -I$OPENSSL_ROOT_DIR/lib + $CPPFLAGS -I$SQLITE_ROOT_DIR/lib -I$GDBM_ROOT_PATH/lib -I$OPENSSL_ROOT_DIR/lib + $LDFLAGS -L$SQLITE_ROOT_DIR/include -L$GDBM_ROOT_PATH/include -L$OPENSSL_ROOT_DIR/include + + + --prefix=$INSTALL_DIR --with-ensurepip --enable-loadable-sqlite-extensions $INSTALL_DIR/bin - + $INSTALL_DIR $INSTALL_DIR/lib/pkgconfig