Mercurial > repos > soranzo > package_pydoop_0_11

changeset 1:24333a826826 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Workaround missing LIBRARY_PATH export from package_openssl_1_0 .
author soranzo
date Wed, 28 May 2014 14:35:18 -0400
parents 14e2e8cccb1e
children 7b4f9da1f195
files tool_dependencies.xml
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Wed May 28 13:22:35 2014 -0400
+++ b/tool_dependencies.xml	Wed May 28 14:35:18 2014 -0400
@@ -13,8 +13,10 @@
           </repository>
         </action>
         <action type="make_directory">$INSTALL_DIR/lib/python</action>
-        <action type="shell_command">export JAVA_HOME=$(readlink -f $(which java)|sed 's|/jre/bin/java$||') &amp;&amp; export HADOOP_HOME=$(readlink -f $(which hadoop)|sed 's|/bin/hadoop$||') &amp;&amp; export PYTHONPATH=$INSTALL_DIR/lib/python:$PYTHONPATH &amp;&amp; python setup.py install --prefix=$INSTALL_DIR --install-lib=$INSTALL_DIR/lib/python</action>
+        <action type="shell_command">export LIBRARY_PATH=$OPENSSL_ROOT_DIR/lib:$LIBRARY_PATH &amp;&amp;<!-- may be removed when package_openssl_1_0 is updated -->
+export JAVA_HOME=$(readlink -f $(which java)|sed 's|/jre/bin/java$||') &amp;&amp; export HADOOP_HOME=$(readlink -f $(which hadoop)|sed 's|/bin/hadoop$||') &amp;&amp; export PYTHONPATH=$INSTALL_DIR/lib/python:$PYTHONPATH &amp;&amp; python setup.py install --prefix=$INSTALL_DIR --install-lib=$INSTALL_DIR/lib/python</action>
         <action type="set_environment">
+          <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/bin</environment_variable>
           <environment_variable action="prepend_to" name="PYTHONPATH">$INSTALL_DIR/lib/python</environment_variable>
         </action>
       </actions>