diff options
| author | James E.H. Turner <jturner@gemini.edu> | 2017-12-18 15:30:18 -0500 |
|---|---|---|
| committer | James E.H. Turner <jturner@gemini.edu> | 2017-12-18 15:30:18 -0500 |
| commit | c176c5423e63b0804a9a32266d901fc75468e32e (patch) | |
| tree | 2ae1d519bcd8b2ed4d1a460de897ed41ee696522 | |
| parent | f13da7e7b7a29e29ed94ab3ca2869b592136e4e6 (diff) | |
| download | astroconda-iraf-c176c5423e63b0804a9a32266d901fc75468e32e.tar.gz | |
Make iraf.aXe build with clang (MacOS 10.10) after change to use old gsl.
| -rw-r--r-- | iraf.axe/build.sh | 12 | ||||
| -rw-r--r-- | iraf.axe/meta.yaml | 2 |
2 files changed, 11 insertions, 3 deletions
diff --git a/iraf.axe/build.sh b/iraf.axe/build.sh index 747ccc8..5222b17 100644 --- a/iraf.axe/build.sh +++ b/iraf.axe/build.sh @@ -5,6 +5,10 @@ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PREFIX/lib" export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:$PREFIX/lib" +# Compilation of the old GSL version fails on clang without allowing for some +# deprecated C usage, as when building IRAF: +export CFLAGS="$CFLAGS -Wno-return-type" + set -e # Creating a dummy STSDAS directory as the install target avoids having IRAF @@ -16,8 +20,12 @@ mkdir -p "$stdir/bin" echo "Build static GSL (old version needed by aXe)" +# Put static GSL in a temporary location, because we don't need to distribute +# its headers & documentation, which might conflict with the gsl conda package, +# plus installing its docs to $PREFIX/info causes conda-build 3.0 to fail. cd gsl -./configure --prefix="$PREFIX" --disable-shared --enable-static --build=x86 +./configure --prefix="${SRC_DIR}/gsl_build" --disable-shared --enable-static \ + --build=x86 make make install # here the GSL COPYRIGHT is covered by aXe's own GPL notice @@ -27,7 +35,7 @@ echo "Build aXe" cd ../aXe/ccc ./configure --prefix="$PREFIX" --with-cfitsio-prefix="$PREFIX" \ --with-wcstools-prefix="$PREFIX/lib" --build=x86 \ - --with-gsl-prefix="$PREFIX" + --with-gsl-prefix="${SRC_DIR}/gsl_build" make echo "Install aXe into STSDAS path" diff --git a/iraf.axe/meta.yaml b/iraf.axe/meta.yaml index ccb8cc3..f8f6e11 100644 --- a/iraf.axe/meta.yaml +++ b/iraf.axe/meta.yaml @@ -7,7 +7,7 @@ about: summary: STScI/STECF aXe add-on for the STSDAS IRAF package build: binary_relocation: True - number: '0' + number: '1' package: name: iraf.axe version: "2.6" |