diff options
| author | Matt Rendina <rendinam@users.noreply.github.com> | 2018-02-22 08:53:06 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-22 08:53:06 -0500 |
| commit | d4ccb57a335dfda4b3583107767a081691352b2f (patch) | |
| tree | 43dd1892560bcc467c5eaf1373390cefe4707acd /hstcal | |
| parent | ebe4788bd2ee01f8b991f02d1665db3d87cc383d (diff) | |
| parent | e027b0e371ddedc4377b43b425d2f67282ff45b7 (diff) | |
| download | astroconda-contrib-d4ccb57a335dfda4b3583107767a081691352b2f.tar.gz | |
Merge branch 'master' into patch-3
Diffstat (limited to 'hstcal')
| -rw-r--r-- | hstcal/build.sh | 5 | ||||
| -rw-r--r-- | hstcal/meta.yaml | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/hstcal/build.sh b/hstcal/build.sh index a10e61f..4845293 100644 --- a/hstcal/build.sh +++ b/hstcal/build.sh @@ -1,7 +1,10 @@ if [[ `uname` == Darwin ]]; then export CC=`which gcc` + export DARWIN_FLAGS='-m64' + export CFLAGS="$CFLAGS $DARWIN_FLAGS" + export LDFLAGS="$LDFLAGS $DARWIN_FLAGS" fi -./waf configure --destdir=$PREFIX +./waf configure --prefix=$PREFIX ./waf build ./waf install diff --git a/hstcal/meta.yaml b/hstcal/meta.yaml index fc7c225..a8420cd 100644 --- a/hstcal/meta.yaml +++ b/hstcal/meta.yaml @@ -1,6 +1,9 @@ {% set name = 'hstcal' %} {% set version = '1.3.0' %} -{% set number = '0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '1' %} about: home: https://github.com/spacetelescope/{{ name }} |