[yt-svn] commit/yt: atmyers: Merged in ngoldbaum/yt (pull request #1834)
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Mon Nov 9 11:12:56 PST 2015
1 new commit in yt:
https://bitbucket.org/yt_analysis/yt/commits/7e0882aabe36/
Changeset: 7e0882aabe36
Branch: yt
User: atmyers
Date: 2015-11-09 19:12:49+00:00
Summary: Merged in ngoldbaum/yt (pull request #1834)
Updating miniconda install script
Affected #: 2 files
diff -r 1e45b8fbc35cf574ed81ed9b86f4fb9aae5ef4f2 -r 7e0882aabe367104e53e790c732ede84d4c9ab1a doc/get_yt.sh
--- a/doc/get_yt.sh
+++ b/doc/get_yt.sh
@@ -23,7 +23,7 @@
DEST_SUFFIX="yt-conda"
DEST_DIR="`pwd`/${DEST_SUFFIX/ /}" # Installation location
BRANCH="yt" # This is the branch to which we will forcibly update.
-INST_YT_SOURCE=1 # Do we do a source install of yt?
+INST_YT_SOURCE=0 # Do we do a source install of yt?
##################################################################
# #
@@ -37,7 +37,7 @@
# ( SOMECOMMAND 2>&1 ) 1>> ${LOG_FILE} || do_exit
MINICONDA_URLBASE="http://repo.continuum.io/miniconda"
-MINICONDA_VERSION="1.9.1"
+MINICONDA_VERSION="latest"
YT_RECIPE_REPO="https://bitbucket.org/yt_analysis/yt_conda/raw/default"
function do_exit
@@ -61,12 +61,14 @@
( $* 2>&1 ) 1>> ${LOG_FILE} || do_exit
}
-function get_ytproject
-{
- [ -e $1 ] && return
- echo "Downloading $1 from yt-project.org"
- ${GETFILE} "http://yt-project.org/dependencies/$1" || do_exit
- ( ${SHASUM} -c $1.sha512 2>&1 ) 1>> ${LOG_FILE} || do_exit
+# These are needed to prevent pushd and popd from printing to stdout
+
+function pushd () {
+ command pushd "$@" > /dev/null
+}
+
+function popd () {
+ command popd "$@" > /dev/null
}
function get_ytdata
@@ -101,122 +103,125 @@
echo "This will install Miniconda from Continuum Analytics, the necessary"
echo "packages to run yt, and create a self-contained environment for you to"
echo "use yt. Additionally, Conda itself provides the ability to install"
-echo "many other packages that can be used for other purposes."
+echo "many other packages that can be used for other purposes using the"
+echo "'conda install' command."
echo
MYOS=`uname -s` # A guess at the OS
-if [ "${MYOS##Darwin}" != "${MYOS}" ]
+if [ $INST_YT_SOURCE -ne 0 ]
then
- echo "Looks like you're running on Mac OSX."
- echo
- echo "NOTE: you must have the Xcode command line tools installed."
- echo
- echo "The instructions for obtaining these tools varies according"
- echo "to your exact OS version. On older versions of OS X, you"
- echo "must register for an account on the apple developer tools"
- echo "website: https://developer.apple.com/downloads to obtain the"
- echo "download link."
- echo
- echo "We have gathered some additional instructions for each"
- echo "version of OS X below. If you have trouble installing yt"
- echo "after following these instructions, don't hesitate to contact"
- echo "the yt user's e-mail list."
- echo
- echo "You can see which version of OSX you are running by clicking"
- echo "'About This Mac' in the apple menu on the left hand side of"
- echo "menu bar. We're assuming that you've installed all operating"
- echo "system updates; if you have an older version, we suggest"
- echo "running software update and installing all available updates."
- echo
- echo "OS X 10.5.8: search for and download Xcode 3.1.4 from the"
- echo "Apple developer tools website."
- echo
- echo "OS X 10.6.8: search for and download Xcode 3.2 from the Apple"
- echo "developer tools website. You can either download the"
- echo "Xcode 3.2.2 Developer Tools package (744 MB) and then use"
- echo "Software Update to update to XCode 3.2.6 or"
- echo "alternatively, you can download the Xcode 3.2.6/iOS SDK"
- echo "bundle (4.1 GB)."
- echo
- echo "OS X 10.7.5: download Xcode 4.2 from the mac app store"
- echo "(search for Xcode)."
- echo "Alternatively, download the Xcode command line tools from"
- echo "the Apple developer tools website."
- echo
- echo "OS X 10.8.2: download Xcode 4.6.1 from the mac app store."
- echo "(search for Xcode)."
- echo "Additionally, you will have to manually install the Xcode"
- echo "command line tools, see:"
- echo "http://stackoverflow.com/questions/9353444"
- echo "Alternatively, download the Xcode command line tools from"
- echo "the Apple developer tools website."
- echo
- echo "NOTE: It's possible that the installation will fail, if so,"
- echo "please set the following environment variables, remove any"
- echo "broken installation tree, and re-run this script verbatim."
- echo
- echo "$ export CC=gcc"
- echo "$ export CXX=g++"
- echo
- MINICONDA_OS="MacOSX-x86_64"
+ if [ "${MYOS##Darwin}" != "${MYOS}" ]
+ then
+ echo "Looks like you're running on Mac OSX."
+ echo
+ echo "NOTE: you must have the Xcode command line tools installed."
+ echo
+ echo "The instructions for obtaining these tools varies according"
+ echo "to your exact OS version. On older versions of OS X, you"
+ echo "must register for an account on the apple developer tools"
+ echo "website: https://developer.apple.com/downloads to obtain the"
+ echo "download link."
+ echo
+ echo "We have gathered some additional instructions for each"
+ echo "version of OS X below. If you have trouble installing yt"
+ echo "after following these instructions, don't hesitate to contact"
+ echo "the yt user's e-mail list."
+ echo
+ echo "You can see which version of OSX you are running by clicking"
+ echo "'About This Mac' in the apple menu on the left hand side of"
+ echo "menu bar. We're assuming that you've installed all operating"
+ echo "system updates; if you have an older version, we suggest"
+ echo "running software update and installing all available updates."
+ echo
+ echo "OS X 10.5.8: search for and download Xcode 3.1.4 from the"
+ echo "Apple developer tools website."
+ echo
+ echo "OS X 10.6.8: search for and download Xcode 3.2 from the Apple"
+ echo "developer tools website. You can either download the"
+ echo "Xcode 3.2.2 Developer Tools package (744 MB) and then use"
+ echo "Software Update to update to XCode 3.2.6 or"
+ echo "alternatively, you can download the Xcode 3.2.6/iOS SDK"
+ echo "bundle (4.1 GB)."
+ echo
+ echo "OS X 10.7.5: download Xcode 4.2 from the mac app store"
+ echo "(search for Xcode)."
+ echo "Alternatively, download the Xcode command line tools from"
+ echo "the Apple developer tools website."
+ echo
+ echo "OS X 10.8.4, 10.9, 10.10, and 10.11:"
+ echo "download the appropriate version of Xcode from the"
+ echo "mac app store (search for Xcode)."
+ echo
+ echo "Additionally, you will have to manually install the Xcode"
+ echo "command line tools."
+ echo
+ echo "For OS X 10.8, see:"
+ echo "http://stackoverflow.com/questions/9353444"
+ echo
+ echo "For OS X 10.9 and newer the command line tools can be installed"
+ echo "with the following command:"
+ echo " xcode-select --install"
+ fi
+ if [ "${MYOS##Linux}" != "${MYOS}" ]
+ then
+ echo "Looks like you're on Linux."
+ echo
+ echo "Please make sure you have the developer tools for your OS "
+ echo "installed."
+ echo
+ if [ -f /etc/SuSE-release ] && [ `grep --count SUSE /etc/SuSE-release` -gt 0 ]
+ then
+ echo "Looks like you're on an OpenSUSE-compatible machine."
+ echo
+ echo "You need to have these packages installed:"
+ echo
+ echo " * devel_C_C++"
+ echo " * libuuid-devel"
+ echo " * gcc-c++"
+ echo " * chrpath"
+ echo
+ echo "You can accomplish this by executing:"
+ echo
+ echo "$ sudo zypper install -t pattern devel_C_C++"
+ echo "$ sudo zypper install gcc-c++ libuuid-devel zip"
+ echo "$ sudo zypper install chrpath"
+ fi
+ if [ -f /etc/lsb-release ] && [ `grep --count buntu /etc/lsb-release` -gt 0 ]
+ then
+ echo "Looks like you're on an Ubuntu-compatible machine."
+ echo
+ echo "You need to have these packages installed:"
+ echo
+ echo " * libssl-dev"
+ echo " * build-essential"
+ echo " * libncurses5"
+ echo " * libncurses5-dev"
+ echo " * uuid-dev"
+ echo " * chrpath"
+ echo
+ echo "You can accomplish this by executing:"
+ echo
+ echo "$ sudo apt-get install libssl-dev build-essential libncurses5 libncurses5-dev zip uuid-dev chrpath"
+ echo
+ fi
+ echo
+ echo "If you are running on a supercomputer or other module-enabled"
+ echo "system, please make sure that the GNU module has been loaded."
+ echo
+ fi
fi
-if [ "${MYOS##Linux}" != "${MYOS}" ]
+if [ "${MYOS##x86_64}" != "${MYOS}" ]
then
- echo "Looks like you're on Linux."
- echo
- echo "Please make sure you have the developer tools for your OS installed."
- echo
- if [ -f /etc/SuSE-release ] && [ `grep --count SUSE /etc/SuSE-release` -gt 0 ]
- then
- echo "Looks like you're on an OpenSUSE-compatible machine."
- echo
- echo "You need to have these packages installed:"
- echo
- echo " * devel_C_C++"
- echo " * libopenssl-devel"
- echo " * libuuid-devel"
- echo " * zip"
- echo " * gcc-c++"
- echo " * chrpath"
- echo
- echo "You can accomplish this by executing:"
- echo
- echo "$ sudo zypper install -t pattern devel_C_C++"
- echo "$ sudo zypper install gcc-c++ libopenssl-devel libuuid-devel zip"
- echo "$ sudo zypper install chrpath"
- fi
- if [ -f /etc/lsb-release ] && [ `grep --count buntu /etc/lsb-release` -gt 0 ]
- then
- echo "Looks like you're on an Ubuntu-compatible machine."
- echo
- echo "You need to have these packages installed:"
- echo
- echo " * libssl-dev"
- echo " * build-essential"
- echo " * libncurses5"
- echo " * libncurses5-dev"
- echo " * zip"
- echo " * uuid-dev"
- echo " * chrpath"
- echo
- echo "You can accomplish this by executing:"
- echo
- echo "$ sudo apt-get install libssl-dev build-essential libncurses5 libncurses5-dev zip uuid-dev chrpath"
- echo
- fi
- echo
- echo "If you are running on a supercomputer or other module-enabled"
- echo "system, please make sure that the GNU module has been loaded."
- echo
- if [ "${MYOS##x86_64}" != "${MYOS}" ]
- then
MINICONDA_OS="Linux-x86_64"
- elif [ "${MYOS##i386}" != "${MYOS}" ]
- then
+elif [ "${MYOS##i386}" != "${MYOS}" ]
+then
MINICONDA_OS="Linux-x86"
- else
- echo "Not sure which type of Linux you're on. Going with x86_64."
+elif [ "${MYOS##Darwin}" != "${MYOS}" ]
+then
+ MINICONDA_OS="MacOSX-x86_64"
+else
+ echo "Not sure which Linux distro you are running."
+ echo "Going with x86_64 architecture."
MINICONDA_OS="Linux-x86_64"
- fi
fi
echo
echo "If you'd rather not continue, hit Ctrl-C."
@@ -233,7 +238,7 @@
if type -P wget &>/dev/null
then
echo "Using wget"
- export GETFILE="wget -nv"
+ export GETFILE="wget -nv -nc"
else
echo "Using curl"
export GETFILE="curl -sSO"
@@ -250,9 +255,6 @@
log_cmd bash ./${MINICONDA_PKG} -b -p $DEST_DIR
-# I don't think we need OR want this anymore:
-#export LD_LIBRARY_PATH=${DEST_DIR}/lib:$LD_LIBRARY_PATH
-
# This we *do* need.
export PATH=${DEST_DIR}/bin:$PATH
@@ -261,51 +263,40 @@
declare -a YT_DEPS
YT_DEPS+=('python')
-YT_DEPS+=('distribute')
-YT_DEPS+=('libpng')
+YT_DEPS+=('setuptools')
YT_DEPS+=('numpy')
-YT_DEPS+=('pygments')
-YT_DEPS+=('jinja2')
-YT_DEPS+=('tornado')
-YT_DEPS+=('pyzmq')
+YT_DEPS+=('jupyter')
YT_DEPS+=('ipython')
YT_DEPS+=('sphinx')
YT_DEPS+=('h5py')
YT_DEPS+=('matplotlib')
YT_DEPS+=('cython')
YT_DEPS+=('nose')
+YT_DEPS+=('conda-build')
+YT_DEPS+=('mercurial')
+YT_DEPS+=('sympy')
# Here is our dependency list for yt
-log_cmd conda config --system --add channels http://repo.continuum.io/pkgs/free
-log_cmd conda config --system --add channels http://repo.continuum.io/pkgs/dev
-log_cmd conda config --system --add channels http://repo.continuum.io/pkgs/gpl
log_cmd conda update --yes conda
-echo "Current dependencies: ${YT_DEPS[@]}"
log_cmd echo "DEPENDENCIES" ${YT_DEPS[@]}
-log_cmd conda install --yes ${YT_DEPS[@]}
-
-echo "Installing mercurial."
-get_ytrecipe mercurial
+for YT_DEP in "${YT_DEPS[@]}"; do
+ echo "Installing $YT_DEP"
+ log_cmd conda install --yes ${YT_DEP}
+done
if [ $INST_YT_SOURCE -eq 0 ]
then
- echo "Installing yt as a package."
- get_ytrecipe yt
+ echo "Installing yt"
+ log_cmd conda install --yes yt
else
- # We do a source install.
- YT_DIR="${DEST_DIR}/src/yt-hg"
- export PNG_DIR=${DEST_DIR}
- export FTYPE_DIR=${DEST_DIR}
- export HDF5_DIR=${DEST_DIR}
- log_cmd hg clone -r ${BRANCH} https://bitbucket.org/yt_analysis/yt ${YT_DIR}
- pushd ${YT_DIR}
- log_cmd python setup.py develop
- popd
- log_cmd cp ${YT_DIR}/doc/activate ${DEST_DIR}/bin/activate
- log_cmd sed -i.bak -e "s,__YT_DIR__,${DEST_DIR}," ${DEST_DIR}/bin/activate
- log_cmd cp ${YT_DIR}/doc/activate.csh ${DEST_DIR}/bin/activate.csh
- log_cmd sed -i.bak -e "s,__YT_DIR__,${DEST_DIR}," ${DEST_DIR}/bin/activate.csh
+ # We do a source install.
+ echo "Installing yt from source"
+ YT_DIR="${DEST_DIR}/src/yt-hg"
+ log_cmd hg clone -r ${BRANCH} https://bitbucket.org/yt_analysis/yt ${YT_DIR}
+ pushd ${YT_DIR}
+ log_cmd python setup.py develop
+ popd
fi
echo
@@ -314,34 +305,26 @@
echo
echo "yt and the Conda system are now installed in $DEST_DIR ."
echo
-if [ $INST_YT_SOURCE -eq 0 ]
-then
- echo "You must now modify your PATH variable by prepending:"
- echo
- echo " $DEST_DIR/bin"
- echo
- echo "For example, if you use bash, place something like this at the end"
- echo "of your ~/.bashrc :"
- echo
- echo " export PATH=$DEST_DIR/bin:$PATH"
-else
- echo "To run from this new installation, use the activate script for this "
- echo "environment."
- echo
- echo " $ source $DEST_DIR/bin/activate"
- echo
- echo "This modifies the environment variables YT_DEST, PATH, PYTHONPATH, and"
- echo "LD_LIBRARY_PATH to match your new yt install. If you use csh, just"
- echo "append .csh to the above."
-fi
+echo "You must now modify your PATH variable by prepending:"
+echo
+echo " $DEST_DIR/bin"
+echo
+echo "On Bash-style shells you can copy/paste the following command to "
+echo "temporarily activate the yt installtion:"
+echo
+echo " export PATH=$DEST_DIR/bin:\$PATH"
+echo
+echo "and on csh-style shells"
+echo
+echo " setenv PATH $DEST_DIR/bin:\$PATH"
+echo
+echo "You can also the init file appropriate for your shell to include the same"
+echo "command."
echo
echo "To get started with yt, check out the orientation:"
echo
echo " http://yt-project.org/doc/orientation/"
echo
-echo "or just activate your environment and run 'yt serve' to bring up the"
-echo "yt GUI."
-echo
echo "For support, see the website and join the mailing list:"
echo
echo " http://yt-project.org/"
diff -r 1e45b8fbc35cf574ed81ed9b86f4fb9aae5ef4f2 -r 7e0882aabe367104e53e790c732ede84d4c9ab1a doc/install_script.sh
--- a/doc/install_script.sh
+++ b/doc/install_script.sh
@@ -233,53 +233,61 @@
echo
echo "NOTE: you must have the Xcode command line tools installed."
echo
- echo "The instructions for obtaining these tools varies according"
- echo "to your exact OS version. On older versions of OS X, you"
- echo "must register for an account on the apple developer tools"
- echo "website: https://developer.apple.com/downloads to obtain the"
- echo "download link."
- echo
- echo "We have gathered some additional instructions for each"
- echo "version of OS X below. If you have trouble installing yt"
- echo "after following these instructions, don't hesitate to contact"
- echo "the yt user's e-mail list."
- echo
- echo "You can see which version of OSX you are running by clicking"
- echo "'About This Mac' in the apple menu on the left hand side of"
- echo "menu bar. We're assuming that you've installed all operating"
- echo "system updates; if you have an older version, we suggest"
- echo "running software update and installing all available updates."
- echo
+ echo "The instructions for obtaining these tools varies according"
+ echo "to your exact OS version. On older versions of OS X, you"
+ echo "must register for an account on the apple developer tools"
+ echo "website: https://developer.apple.com/downloads to obtain the"
+ echo "download link."
+ echo
+ echo "We have gathered some additional instructions for each"
+ echo "version of OS X below. If you have trouble installing yt"
+ echo "after following these instructions, don't hesitate to contact"
+ echo "the yt user's e-mail list."
+ echo
+ echo "You can see which version of OSX you are running by clicking"
+ echo "'About This Mac' in the apple menu on the left hand side of"
+ echo "menu bar. We're assuming that you've installed all operating"
+ echo "system updates; if you have an older version, we suggest"
+ echo "running software update and installing all available updates."
+ echo
echo "OS X 10.5.8: search for and download Xcode 3.1.4 from the"
- echo "Apple developer tools website."
+ echo "Apple developer tools website."
echo
echo "OS X 10.6.8: search for and download Xcode 3.2 from the Apple"
- echo "developer tools website. You can either download the"
- echo "Xcode 3.2.2 Developer Tools package (744 MB) and then use"
- echo "Software Update to update to XCode 3.2.6 or"
- echo "alternatively, you can download the Xcode 3.2.6/iOS SDK"
- echo "bundle (4.1 GB)."
+ echo "developer tools website. You can either download the"
+ echo "Xcode 3.2.2 Developer Tools package (744 MB) and then use"
+ echo "Software Update to update to XCode 3.2.6 or"
+ echo "alternatively, you can download the Xcode 3.2.6/iOS SDK"
+ echo "bundle (4.1 GB)."
echo
echo "OS X 10.7.5: download Xcode 4.2 from the mac app store"
- echo "(search for Xcode)."
+ echo "(search for Xcode)."
echo "Alternatively, download the Xcode command line tools from"
echo "the Apple developer tools website."
echo
- echo "OS X 10.8.4, 10.9, and 10.10: download the appropriate version of"
- echo "Xcode from the mac app store (search for Xcode)."
- echo
- echo "Additionally, you will have to manually install the Xcode"
- echo "command line tools."
- echo
- echo "For OS X 10.8, see:"
- echo "http://stackoverflow.com/questions/9353444"
- echo
- echo "For OS X 10.9 and 10.10, the command line tools can be installed"
- echo "with the following command:"
- echo " xcode-select --install"
- echo
- OSX_VERSION=`sw_vers -productVersion`
- if [ "${OSX_VERSION##10.8}" != "${OSX_VERSION}" ]
+ echo "OS X 10.8.4, 10.9, 10.10, and 10.11:"
+ echo "download the appropriate version of Xcode from the"
+ echo "mac app store (search for Xcode)."
+ echo
+ echo "Additionally, you will have to manually install the Xcode"
+ echo "command line tools."
+ echo
+ echo "For OS X 10.8, see:"
+ echo "http://stackoverflow.com/questions/9353444"
+ echo
+ echo "For OS X 10.9 and newer the command line tools can be installed"
+ echo "with the following command:"
+ echo " xcode-select --install"
+ echo
+ echo "For OS X 10.11, you will additionally need to install the OpenSSL"
+ echo "library using a package manager like homebrew or macports."
+ echo "If you install fails with a message like"
+ echo " ImportError: cannot import HTTPSHandler"
+ echo "then you do not have the OpenSSL headers available in a location"
+ echo "visible to your C compiler. Consider installing yt using the"
+ echo "get_yt.sh script instead, as that bundles OpenSSL."
+ OSX_VERSION=`sw_vers -productVersion`
+ if [ "${OSX_VERSION##10.8}" != "${OSX_VERSION}" ]
then
MPL_SUPP_CFLAGS="${MPL_SUPP_CFLAGS} -mmacosx-version-min=10.7"
MPL_SUPP_CXXFLAGS="${MPL_SUPP_CXXFLAGS} -mmacosx-version-min=10.7"
@@ -358,17 +366,17 @@
fi
if [ $INST_SCIPY -eq 1 ]
then
- echo
- echo "Looks like you've requested that the install script build SciPy."
- echo
- echo "If the SciPy build fails, please uncomment one of the the lines"
- echo "at the top of the install script that sets NUMPY_ARGS, delete"
- echo "any broken installation tree, and re-run the install script"
- echo "verbatim."
- echo
- echo "If that doesn't work, don't hesitate to ask for help on the yt"
- echo "user's mailing list."
- echo
+ echo
+ echo "Looks like you've requested that the install script build SciPy."
+ echo
+ echo "If the SciPy build fails, please uncomment one of the the lines"
+ echo "at the top of the install script that sets NUMPY_ARGS, delete"
+ echo "any broken installation tree, and re-run the install script"
+ echo "verbatim."
+ echo
+ echo "If that doesn't work, don't hesitate to ask for help on the yt"
+ echo "user's mailing list."
+ echo
fi
if [ ! -z "${CFLAGS}" ]
then
@@ -490,9 +498,9 @@
if [ $INST_PY3 -eq 1 ]
then
- PYTHON_EXEC='python3.4'
+ PYTHON_EXEC='python3.4'
else
- PYTHON_EXEC='python2.7'
+ PYTHON_EXEC='python2.7'
fi
function do_setup_py
@@ -899,28 +907,28 @@
else
if [ ! -e $SCIPY/done ]
then
- if [ ! -e BLAS/done ]
- then
- tar xfz blas.tar.gz
- echo "Building BLAS"
- cd BLAS
- gfortran -O2 -fPIC -fno-second-underscore -c *.f
- ( ar r libfblas.a *.o 2>&1 ) 1>> ${LOG_FILE}
- ( ranlib libfblas.a 2>&1 ) 1>> ${LOG_FILE}
- rm -rf *.o
- touch done
- cd ..
- fi
- if [ ! -e $LAPACK/done ]
- then
- tar xfz $LAPACK.tar.gz
- echo "Building LAPACK"
- cd $LAPACK/
- cp INSTALL/make.inc.gfortran make.inc
- ( make lapacklib OPTS="-fPIC -O2" NOOPT="-fPIC -O0" CFLAGS=-fPIC LDFLAGS=-fPIC 2>&1 ) 1>> ${LOG_FILE} || do_exit
- touch done
- cd ..
- fi
+ if [ ! -e BLAS/done ]
+ then
+ tar xfz blas.tar.gz
+ echo "Building BLAS"
+ cd BLAS
+ gfortran -O2 -fPIC -fno-second-underscore -c *.f
+ ( ar r libfblas.a *.o 2>&1 ) 1>> ${LOG_FILE}
+ ( ranlib libfblas.a 2>&1 ) 1>> ${LOG_FILE}
+ rm -rf *.o
+ touch done
+ cd ..
+ fi
+ if [ ! -e $LAPACK/done ]
+ then
+ tar xfz $LAPACK.tar.gz
+ echo "Building LAPACK"
+ cd $LAPACK/
+ cp INSTALL/make.inc.gfortran make.inc
+ ( make lapacklib OPTS="-fPIC -O2" NOOPT="-fPIC -O0" CFLAGS=-fPIC LDFLAGS=-fPIC 2>&1 ) 1>> ${LOG_FILE} || do_exit
+ touch done
+ cd ..
+ fi
fi
export BLAS=$PWD/BLAS/libfblas.a
export LAPACK=$PWD/$LAPACK/liblapack.a
@@ -1030,7 +1038,7 @@
cd $MY_PWD
if !( ( ${DEST_DIR}/bin/${PYTHON_EXEC} -c "import readline" 2>&1 )>> ${LOG_FILE}) || \
- [[ "${MYOS##Darwin}" != "${MYOS}" && $INST_PY3 -eq 1 ]]
+ [[ "${MYOS##Darwin}" != "${MYOS}" && $INST_PY3 -eq 1 ]]
then
if !( ( ${DEST_DIR}/bin/${PYTHON_EXEC} -c "import gnureadline" 2>&1 )>> ${LOG_FILE})
then
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.
More information about the yt-svn
mailing list