diff options
| author | Joseph Hunkeler <jhunkeler@users.noreply.github.com> | 2016-11-10 13:29:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-10 13:29:56 -0500 |
| commit | a765697cb9a934c4a6345347da1dda807e8db519 (patch) | |
| tree | 020800c929794a0d9fd4d754a5edb33a70885ff0 | |
| parent | 8b12c24e7af40edcbdfab024736176531fc86e80 (diff) | |
| download | astroconda-contrib-a765697cb9a934c4a6345347da1dda807e8db519.tar.gz | |
Atlas fixes (#104)
* Update atlas-generic so it builds
* Fix quoted OPTIONS
| -rw-r--r-- | atlas-generic/build.sh | 33 | ||||
| -rw-r--r-- | atlas-generic/meta.yaml | 2 |
2 files changed, 16 insertions, 19 deletions
diff --git a/atlas-generic/build.sh b/atlas-generic/build.sh index ce5d3eb..f962f6a 100644 --- a/atlas-generic/build.sh +++ b/atlas-generic/build.sh @@ -1,23 +1,20 @@ - - export LIBTOOL=/usr/bin/libtool export OPTIONS= case "$(uname -s)" in -Darwin) -export CC=/opt/local/bin/gcc-mp-4.8 -export F77=/opt/local/bin/gfortran-mp-4.8 -export OPTIONS="-C agc $CC -C if $F77 --shared -t 2 -b 64 -V 128 -A 12" -;; -Linux) -export CC=/usr/bin/gcc -export F77=/usr/bin/gfortran -export OPTIONS="-C agc $CC -C if $F77 --shared -t 2 -b 64 -V 128 -A 12" -;; -*) -;; + Darwin) + export CC=/opt/local/bin/gcc-mp-4.8 + export F77=/opt/local/bin/gfortran-mp-4.8 + ;; + Linux) + export CC=/usr/bin/gcc + export F77=/usr/bin/gfortran + ;; + *) + ;; esac +export OPTIONS="-Fa alg -fPIC -C agc $CC -C if $F77 --shared -t 2 -b 64 -V 128 -A 12" export LAPACK_VERSION=3.5.0 export LAPACK_TARBALL=lapack-${LAPACK_VERSION}.tgz export LAPACK_URL="http://www.netlib.org/lapack/${LAPACK_TARBALL}" @@ -26,10 +23,10 @@ wget ${LAPACK_URL} mkdir -p build pushd ./build ../configure --prefix=$PREFIX \ ---with-netlib-lapack-tarfile=../${LAPACK_TARBALL} \ -"${OPTIONS}" + --with-netlib-lapack-tarfile=../${LAPACK_TARBALL} \ + ${OPTIONS} -make LIBTOOL=$LIBTOOL +make LIBTOOL=$LIBTOOL CC=$CC F77=$F77 make install -popd
\ No newline at end of file +popd diff --git a/atlas-generic/meta.yaml b/atlas-generic/meta.yaml index 5003875..5339ba0 100644 --- a/atlas-generic/meta.yaml +++ b/atlas-generic/meta.yaml @@ -3,7 +3,7 @@ about: license: BSD summary: atlas-generic build: - number: '0' + number: '1' package: name: atlas-generic version: 3.10.2 |