diff options
author | RTF User <rtfuser@sbfsusdev-mp1.cl.gemini.edu> | 2016-06-07 20:58:35 -0400 |
---|---|---|
committer | RTF User <rtfuser@sbfsusdev-mp1.cl.gemini.edu> | 2016-06-07 20:58:35 -0400 |
commit | 2a3119dc73fce3ed647f227bc95fdad9c61bccfe (patch) | |
tree | ce01048cadc611e141f417ef96449a9db5dc2153 /iraf | |
parent | 586b0ca31224ee8817dceb6a185bfe9dbf5f037d (diff) | |
download | astroconda-iraf-2a3119dc73fce3ed647f227bc95fdad9c61bccfe.tar.gz |
Work with my IRAF SVN branch for now. Correct version number and license info.
Don't patch IRAF binary paths. Unset conda ARCH variable for the IRAF build (it
didn't seem to break mine but I believe IRAF uses it differently & Joe has been
having some arch-related issues).
Diffstat (limited to 'iraf')
-rw-r--r-- | iraf/build.sh | 1 | ||||
-rw-r--r-- | iraf/meta.yaml | 10 |
2 files changed, 7 insertions, 4 deletions
diff --git a/iraf/build.sh b/iraf/build.sh index c500e74..bdf4804 100644 --- a/iraf/build.sh +++ b/iraf/build.sh @@ -2,6 +2,7 @@ mkdir -p `pwd`/logs # Drop extraneous conda-set environment variables +unset ARCH unset CFLAGS unset CXXFLAGS unset LDFLAGS diff --git a/iraf/meta.yaml b/iraf/meta.yaml index 495b647..1719e86 100644 --- a/iraf/meta.yaml +++ b/iraf/meta.yaml @@ -1,13 +1,15 @@ about: home: http://iraf.noao.edu - license: MIT + license: MIT (and third-party licenses) summary: NOAO Image Reduction and Analysis Facility build: - #binary_relocation: False [osx] + binary_relocation: False #detect_binary_files_with_prefix: False [osx] number: '0' package: name: iraf - version: 2.16.1 + version: 2.16_UR source: - git_url: /eng/ssb/jhunk/git-repos/iraf.git + # svn_url: https://aeon.stsci.edu/ssb/svn/u-rel/iraf-2.16/branches/jhunk-patches + # svn_rev: 4156 + svn_url: https://aeon.stsci.edu/ssb/svn/u-rel/iraf-2.16/branches/conda_patches |