diff options
| author | Todd Miller <jmiller@stsci.edu> | 2018-10-08 11:29:58 -0400 |
|---|---|---|
| committer | Todd Miller <jmiller@stsci.edu> | 2018-10-08 11:29:58 -0400 |
| commit | 829b9f0571af9ed22114b70071a1ae7317706e4c (patch) | |
| tree | f44e9bc0352998d09c28934ee0760a5b01c632a1 /hstcal | |
| parent | ff7bb35c63ef298df2207dbfdc49e441cec0e2ae (diff) | |
| parent | d75fa7d104a59296efa95bafb7c17b46e7e18dd6 (diff) | |
| download | astroconda-contrib-829b9f0571af9ed22114b70071a1ae7317706e4c.tar.gz | |
Merge branch 'master' of https://github.com/astroconda/astroconda-contrib into update-crds-version
Diffstat (limited to 'hstcal')
| -rw-r--r-- | hstcal/build.sh | 9 | ||||
| -rw-r--r-- | hstcal/meta.yaml | 16 |
2 files changed, 18 insertions, 7 deletions
diff --git a/hstcal/build.sh b/hstcal/build.sh index 4845293..a9727f0 100644 --- a/hstcal/build.sh +++ b/hstcal/build.sh @@ -1,10 +1,11 @@ if [[ `uname` == Darwin ]]; then export CC=`which gcc` - export DARWIN_FLAGS='-m64' - export CFLAGS="$CFLAGS $DARWIN_FLAGS" - export LDFLAGS="$LDFLAGS $DARWIN_FLAGS" + if [[ `uname -m` == x86_64 ]]; then + export CFLAGS="$CFLAGS -m64" + export LDFLAGS="$LDFLAGS -m64" + fi fi -./waf configure --prefix=$PREFIX +./waf configure --prefix=$PREFIX --release-with-symbols ./waf build ./waf install diff --git a/hstcal/meta.yaml b/hstcal/meta.yaml index 26b999f..b6189ca 100644 --- a/hstcal/meta.yaml +++ b/hstcal/meta.yaml @@ -1,6 +1,6 @@ {% set name = 'hstcal' %} {% set version = '2.0.0' %} -{% set number = '0' %} +{% set number = '1' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -16,10 +16,20 @@ package: requirements: build: - - gcc >=4.6 [osx] + - cfitsio >=3.440 + - pkg-config + - gcc >=4.7 + run: - - libgcc >=4.6 [osx] + - cfitsio + - libgcc >=4.7 source: git_tag: {{ version }} git_url: https://github.com/spacetelescope/{{ name }}.git + +test: + commands: + - calacs.e --gitinfo + - otool -L $(which calacs.e) [osx] + - ldd $(which calacs.e) [linux] |