changeset 4:fa963d91e4bc

Uploaded
author bgruening
date Fri, 26 Apr 2013 06:37:23 -0400
parents 95ed6d984eab
children d5a625cee046
files tool_dependencies.xml
diffstat 1 files changed, 12 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Thu Apr 25 09:33:47 2013 -0400
+++ b/tool_dependencies.xml	Fri Apr 26 06:37:23 2013 -0400
@@ -1,11 +1,22 @@
 <tool_dependency>
+    <package name="bzlib" version="1.0.6">
+        <repository toolshed="http://testtoolshed.g2.bx.psu.edu/" name="package_bzlib_1_0" owner="bgruening" changeset_revision="b9fe39021708" prior_installation_required="True" />
+    </package>
     <package name="boost" version="1.53.0">
         <install version="1.0">
             <actions>
                 <action type="download_by_url">http://downloads.sourceforge.net/project/boost/boost/1.53.0/boost_1_53_0.tar.bz2</action>
+
+                <!-- populate the environment variables from the dependend repos -->
+                <action type="set_environment_for_install">
+                    <repository toolshed="http://testtoolshed.g2.bx.psu.edu/" name="package_bzlib_1_0" owner="bgruening" changeset_revision="b9fe39021708">
+                        <package name="bzlib" version="1.0.6" />
+                    </repository>
+                </action>
+
                 <action type="shell_command">./bootstrap.sh</action>
                 <!-- try to set the right architecture with uname -m -->
-                <action type="shell_command">if [ $(uname -m) == 'x86_64' ]; then ./bjam install --prefix=$INSTALL_DIR/boost/; else ./bjam address-model=64 cflags=-fPIC cxxflags=-fPIC install --prefix=$INSTALL_DIR/boost/; fi;</action>
+                <action type="shell_command">if [ $(uname -m) == 'x86_64' ]; then ./bjam install --prefix=$INSTALL_DIR/boost/ -sBZIP2_INCLUDE=$BZLIB_INCLUDE_DIR -sBZIP2_LIB=$BZLIB_LIB_DIR -sBZIP2_SOURCE=$BZLIB_SOURCE_DIR; else ./bjam address-model=64 cflags=-fPIC cxxflags=-fPIC install --prefix=$INSTALL_DIR/boost/ -sBZIP2_INCLUDE=$BZLIB_INCLUDE_DIR -sBZIP2_LIB=$BZLIB_LIB_DIR -sBZIP2_SOURCE=$BZLIB_SOURCE_DIR; fi;</action>
 
                 <action type="set_environment">
                     <environment_variable name="BOOST_ROOT_DIR" action="set_to">$INSTALL_DIR/boost/</environment_variable>