aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--iraf/iraf.ini47
1 files changed, 38 insertions, 9 deletions
diff --git a/iraf/iraf.ini b/iraf/iraf.ini
index 64b7bca..947528f 100644
--- a/iraf/iraf.ini
+++ b/iraf/iraf.ini
@@ -16,7 +16,7 @@ url:
#git_url: ssh://git@bitbucket.org/jhunkeler/${package:name}-combined
[build]
-number: 8
+number: 11
#detect_binary_files_with_prefix: True
[requirements]
@@ -64,6 +64,7 @@ linux:
VARIANTS=http://ssb.stsci.edu/stripped/$$PLATFORM/variants.tar.gz
curl -O $$VARIANTS
tar xf variants.tar.gz -C $$PREFIX
+ rm -f variants.tar.gz
# Pseudo-install variant bin directory contents
mkdir -p $$PREFIX/bin
@@ -73,6 +74,16 @@ linux:
( cd $$PREFIX/bin && ln -s -f $$binary )
done
+ X11IRAF=http://ssb.stsci.edu/stripped/$$PLATFORM/x11iraf.tar.gz
+ curl -O $$X11IRAF
+ # We don't untar directly into PREFIX because it will mangle the structure
+ tar xf x11iraf.tar.gz
+ rm -f x11iraf.tar.gz
+
+ rsync -aH x11iraf/bin/ $$PREFIX/bin
+ rsync -aH x11iraf/man/ $$PREFIX/share/man
+ rm -rf x11iraf
+
export TERM=xterm
export PATH=`purge_path /sw`
export iraf=$$PREFIX/iraf/
@@ -95,7 +106,7 @@ linux:
#sed -i -e 's|$${HOME}/.iraf/|$${iraf_runtime} -I$${iraf}/include|g' $$iraf/unix/hlib/irafuser.*sh
# Setup invocation symlinks
- ( cd bin && \
+ ( cd $$PREFIX/bin && \
ln -s -f $$iraf/unix/hlib/cl.sh cl && \
ln -s -f $$iraf/unix/hlib/mkiraf.sh mkiraf && \
ln -s -f $$iraf/unix/hlib/mkmlist.sh mkmlist && \
@@ -139,13 +150,31 @@ linux:
export F2C=\$$hbin/f2c.e
export F77=\$$hbin/f77.sh
export RANLIB=ranlib
-
- export HSI_CF="-I\$$iraf/include -O -DLINUX -DREDHAT -DPOSIX -DSYSV -w -m32 -Wunused"
- export HSI_FF="-I\$$iraf/include -O -DBLD_KERNEL -m32"
- export HSI_LF="-I\$$iraf/include -m32"
- export HSI_XF="-I\$$iraf/include -Inolibc -w -/Wunused -/m32"
+
+ case "$$IRAFARCH" in
+ macosx)
+ export HSI_CF=\"-O -DMACOSX -w -Wunused -arch i386 -m32 -mmacosx-version-min=10.4\"
+ export HSI_XF=\"-Inolibc -/DMACOSX -w -/Wunused -/m32 -/arch -//i386 -/mmacosx-version-min=10.4\"
+ export HSI_FF=\"-O -arch i386 -m32 -DBLD_KERNEL -mmacosx-version-min=10.4\"
+ export HSI_LF=\"-arch i386 -m32 -mmacosx-version-min=10.4\"
+ ;;
+
+ linux)
+ export HSI_CF=\"-I\$$iraf/include -O -DLINUX -DREDHAT -DPOSIX -DSYSV -w -m32 -Wunused\"
+ export HSI_FF=\"-I\$$iraf/include -O -DBLD_KERNEL -m32\"
+ export HSI_LF=\"-I\$$iraf/include -m32\"
+ export HSI_XF=\"-I\$$iraf/include -Inolibc -w -/Wunused -/m32\"
+ ;;
+
+ *)
+ echo "Unknown IRAFARCH. Dying."
+ exit 1
+ ;;
+
+ esac
+
export HSI_F77LIBS=
- export HSI_LIBS="\$$iraf/unix/hlib/libboot.a \$$iraf/lib/libsys.a \$$iraf/lib/libvops.a \$$iraf/unix/hlib/libos.a"
+ export HSI_LIBS=\"\$$iraf/unix/hlib/libboot.a \$$iraf/lib/libsys.a \$$iraf/lib/libvops.a \$$iraf/unix/hlib/libos.a\"
export HSI_OSLIBS=
# Pseudo-Ureka
@@ -153,7 +182,7 @@ linux:
export UR_CPU=x86_64
export UR_DIR=\$$CONDA_ENV_PATH
export UR_VARIANT=common
- export UR_OS=linux
+ export UR_OS=$$PLATFORM
export UR_TMP=/tmp
export UR_DIR_PKG=\$$UR_DIR/variants/\$$UR_VARIANT/
" > $$PREFIX/etc/conda/activate.d/iraf.sh