[Yt-svn] commit/yt: 2 new changesets

[Bitbucket]

2 new changesets in yt:

http://bitbucket.org/yt_analysis/yt/changeset/c3d6c6460616/
changeset:   r4180:c3d6c6460616
branch:      yt
user:        MatthewTurk
date:        2011-04-21 21:25:46
summary:     Fixing an issue reported by BrandonB about libbz2 on OSX
affected #:  1 file (220 bytes)

--- a/doc/install_script.sh	Thu Apr 21 13:20:53 2011 -0400
+++ b/doc/install_script.sh	Thu Apr 21 15:25:46 2011 -0400
@@ -319,7 +319,15 @@
         [ ! -e bzip2-1.0.5 ] && tar xfz bzip2-1.0.5.tar.gz
         echo "Installing BZLIB"
         cd bzip2-1.0.5
-        [ `uname` = "Darwin" ] && sed -i.bak 's/soname/install_name/' Makefile-libbz2_so
+        if [ `uname` = "Darwin" ] 
+        then
+            if [ -z "${CC}" ] 
+            then
+                sed -i.bak 's/soname/install_name/' Makefile-libbz2_so
+            else
+                sed -i.bak -e 's/soname/install_name/' -e "s/CC=gcc/CC=${CC}/" Makefile-libbz2_so 
+            fi
+        fi
         ( make install CFLAGS=-fPIC LDFLAGS=-fPIC PREFIX=${DEST_DIR} 2>&1 ) 1>> ${LOG_FILE} || do_exit
         ( make -f Makefile-libbz2_so CFLAGS=-fPIC LDFLAGS=-fPIC PREFIX=${DEST_DIR} 2>&1 ) 1>> ${LOG_FILE} || do_exit
         ( cp -v libbz2.so.1.0.4 ${DEST_DIR}/lib 2>&1 ) 1>> ${LOG_FILE} || do_exit


http://bitbucket.org/yt_analysis/yt/changeset/296418334642/
changeset:   r4181:296418334642
branch:      stable
user:        MatthewTurk
date:        2011-04-21 21:25:46
summary:     Fixing an issue reported by BrandonB about libbz2 on OSX
affected #:  1 file (220 bytes)

--- a/doc/install_script.sh	Mon Apr 18 16:06:45 2011 -0400
+++ b/doc/install_script.sh	Thu Apr 21 15:25:46 2011 -0400
@@ -319,7 +319,15 @@
         [ ! -e bzip2-1.0.5 ] && tar xfz bzip2-1.0.5.tar.gz
         echo "Installing BZLIB"
         cd bzip2-1.0.5
-        [ `uname` = "Darwin" ] && sed -i.bak 's/soname/install_name/' Makefile-libbz2_so
+        if [ `uname` = "Darwin" ] 
+        then
+            if [ -z "${CC}" ] 
+            then
+                sed -i.bak 's/soname/install_name/' Makefile-libbz2_so
+            else
+                sed -i.bak -e 's/soname/install_name/' -e "s/CC=gcc/CC=${CC}/" Makefile-libbz2_so 
+            fi
+        fi
         ( make install CFLAGS=-fPIC LDFLAGS=-fPIC PREFIX=${DEST_DIR} 2>&1 ) 1>> ${LOG_FILE} || do_exit
         ( make -f Makefile-libbz2_so CFLAGS=-fPIC LDFLAGS=-fPIC PREFIX=${DEST_DIR} 2>&1 ) 1>> ${LOG_FILE} || do_exit
         ( cp -v libbz2.so.1.0.4 ${DEST_DIR}/lib 2>&1 ) 1>> ${LOG_FILE} || do_exit

Repository URL: https://bitbucket.org/yt_analysis/yt/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.