diff options
| author | James E.H. Turner <jturner@gemini.edu> | 2016-10-12 17:05:01 -0400 |
|---|---|---|
| committer | James E.H. Turner <jturner@gemini.edu> | 2016-10-12 17:05:01 -0400 |
| commit | 21c4ce119913c20c0b31b172b3780ff620baf259 (patch) | |
| tree | 4e81179d54407998faaa3cd00cf281a006a59e31 | |
| parent | b4046c3cf7e7f8aaa7803d0fbdad89ba9b09b6a1 (diff) | |
| download | astroconda-iraf-21c4ce119913c20c0b31b172b3780ff620baf259.tar.gz | |
Rework x11iraf build slightly, as for iraf, to use new unix/hlib/setup and log the main build output.
| -rw-r--r-- | iraf-x11/build.sh | 14 | ||||
| -rw-r--r-- | iraf-x11/meta.yaml | 9 |
2 files changed, 10 insertions, 13 deletions
diff --git a/iraf-x11/build.sh b/iraf-x11/build.sh index f4dad04..02f6592 100644 --- a/iraf-x11/build.sh +++ b/iraf-x11/build.sh @@ -1,21 +1,17 @@ # Drop extraneous conda-set environment variables -unset CFLAGS -unset CXXFLAGS -unset LDFLAGS +unset ARCH CFLAGS CXXFLAGS LDFLAGS MACOSX_DEPLOYMENT_TARGET # Complement build script -# ("UR_IRAFUSER" MUST BE SET OR BUILD WILL FAIL) -export UR_IRAFUSER=1 export TERM=xterm - -# Copy working directory into PREFIX +# Tell the build script where IRAF is (& it will then set up its environment) export iraf=$PREFIX/iraf/ # Execute build -printenv -./build 32 +printenv > build_log 2>&1 +./build 32 >> build_log 2>&1 +# Copy files into PREFIX mkdir -p $PREFIX/{bin,include,lib,share} ./install.bin $PREFIX ./install.lib $PREFIX diff --git a/iraf-x11/meta.yaml b/iraf-x11/meta.yaml index 024e5c5..4ccf72a 100644 --- a/iraf-x11/meta.yaml +++ b/iraf-x11/meta.yaml @@ -8,11 +8,12 @@ build: number: '0' package: name: iraf-x11 - version: 2.0 + version: "2.0" requirements: build: - - iraf + - iraf !=2.16.1,>=2.16.UR run: - - iraf + - iraf !=2.16.1,>=2.16.UR source: - git_url: /eng/ssb/jhunk/git-repos/x11iraf.git + svn_url: https://aeon.stsci.edu/ssb/svn/u-rel/x11iraf/trunk/ + |