diff options
| author | Matt Rendina <rendinam@users.noreply.github.com> | 2020-04-07 08:50:52 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-07 08:50:52 -0400 |
| commit | bc8cc8ffa6aa61865598c79c96a85badf405813b (patch) | |
| tree | e1b193a35479c88be557d0fb0d1c6d5a0fc3db27 | |
| parent | cc9bf29e05e8fd9c3ff6725c67a4d6b417f97893 (diff) | |
| download | astroconda-contrib-bc8cc8ffa6aa61865598c79c96a85badf405813b.tar.gz | |
Add bzip2 dep to cfitsio. Request rebuild of fitsverify to sync. (#637)
| -rw-r--r-- | cfitsio/meta.yaml | 8 | ||||
| -rw-r--r-- | fitsverify/meta.yaml | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/cfitsio/meta.yaml b/cfitsio/meta.yaml index a254ebd..0178c43 100644 --- a/cfitsio/meta.yaml +++ b/cfitsio/meta.yaml @@ -1,7 +1,7 @@ {% set name = 'cfitsio' %} {% set version = '3.470' %} {% set version_short = '3470' %} -{% set number = '0' %} +{% set number = '1' %} about: home: http://heasarc.gsfc.nasa.gov/fitsio/fitsio.html @@ -19,10 +19,12 @@ package: requirements: build: - - gcc >=4.6 + - gcc_linux-64 [linux] + - bzip2 run: - - libgcc >=4.6 + - libgcc >=4.7 + - bzip2 source: fn: {{ name }}{{ version_short }}.tar.gz diff --git a/fitsverify/meta.yaml b/fitsverify/meta.yaml index 1efa4b4..ac2ea0e 100644 --- a/fitsverify/meta.yaml +++ b/fitsverify/meta.yaml @@ -1,6 +1,6 @@ {% set name = 'fitsverify' %} {% set version = '4.18' %} -{% set number = '12' %} +{% set number = '13' %} # number = 1 ; legacy, links against whatever is provided by available cfitsio package # number = 2 ; links against cfitsio < 3.410 # number = 3 ; links against cfitsio >= 3.410 @@ -9,6 +9,7 @@ # number = 7 ; links against cfitsio > 3.440 (now provided by conda) # number = 8 ; Rebuild to link against cfitsio from Astroconda (conda's cfitsio uses # broken curl things. Astroconda cfitsio is patched to avoid. +# = 13 ; link against new cfitsio build with added bzip2 dependency about: home: http://heasarc.gsfc.nasa.gov/fitsio/fitsio.html |