diff tool_dependencies.xml @ 92:dede77ad7069

update to latest zlib, remove workaround for missing zlib env variable
author Jan Kanis <jan.code@jankanis.nl>
date Tue, 24 Jun 2014 18:12:19 +0200
parents 20639b08d781
children 15b289ffdf2b
line wrap: on
line diff
--- a/tool_dependencies.xml	Tue Jun 24 17:59:12 2014 +0200
+++ b/tool_dependencies.xml	Tue Jun 24 18:12:19 2014 +0200
@@ -12,7 +12,7 @@
 
   <package name="zlib" version="1.2.8">
     <repository name="package_zlib_1_2_8" owner="iuc" prior_installation_required="True"
-                toolshed="http://toolshed.g2.bx.psu.edu" changeset_revision="31f1e69aae89" />
+                toolshed="http://toolshed.g2.bx.psu.edu" changeset_revision="63a4a902cda2" />
   </package>
 
   <package name="blast2html_venv" version="0.2">
@@ -28,7 +28,7 @@
             <package name="libxslt" version="1.1.28" />
           </repository>
           <repository name="package_zlib_1_2_8" owner="iuc"
-                      toolshed="http://toolshed.g2.bx.psu.edu" changeset_revision="31f1e69aae89">
+                      toolshed="http://toolshed.g2.bx.psu.edu" changeset_revision="63a4a902cda2">
             <package name="zlib" version="1.2.8" />
           </repository>
         </action>
@@ -42,12 +42,11 @@
 	<!-- install lxml manually, as the setup_virtualenv action does not include the environment
 	     from set_environment_for_install but shell_command does -->
 	<action type="shell_command">
-	  export LIBRARY_PATH="$ZLIB_ROOT_PATH/lib:$LIBRARY_PATH"
 	  $INSTALL_DIR/venv/bin/pip install lxml==3.3.5
 	</action>
 	
         <action type="set_environment">
-          <!-- add libxml2 library path so the runtime can find the shared library -->
+          <!-- add libxml2/zlib library paths so the runtime can find the shared libraries -->
           <environment_variable name="LD_LIBRARY_PATH" action="prepend_to">$ENV[LD_LIBRARY_PATH]</environment_variable>
         </action>
       </actions>