diff options
| author | Joe Hunkeler <jhunkeler@gmail.com> | 2015-10-04 14:09:21 -0400 |
|---|---|---|
| committer | Joe Hunkeler <jhunkeler@gmail.com> | 2015-10-04 14:09:21 -0400 |
| commit | b36f594450a401300d9f83ea365009cd146ae24f (patch) | |
| tree | 12b16156348ad0daaa4e0a631edcfc9e543bd0ae | |
| parent | 950119e49cd074efdc7e8e21a2f77ed91798ec41 (diff) | |
| download | cbc-recipes-b36f594450a401300d9f83ea365009cd146ae24f.tar.gz | |
Fix compatibility issues
| -rw-r--r-- | ds9/ds9.ini | 30 | ||||
| -rw-r--r-- | sextractor/sextractor-generic.ini | 28 | ||||
| -rw-r--r-- | sextractor/sextractor.ini | 21 | ||||
| -rw-r--r-- | stsci/stsci.ini | 8 |
4 files changed, 69 insertions, 18 deletions
diff --git a/ds9/ds9.ini b/ds9/ds9.ini index 449aa04..be6b0e4 100644 --- a/ds9/ds9.ini +++ b/ds9/ds9.ini @@ -29,14 +29,28 @@ commands : [cbc_build] linux : - ln -s make.darwinmavericks make.include - sed -i -e '/^ZZ/ s/$$/ -arch x86_64/' \ - -e '/^AA/ s/$$/ -arch x86_64/' make.include - - sed -i -e '/CODESIGN =/c \ - CODESIGN = echo' make.include - - make LDFLAGS='-arch x86_64 -m64' + case "$$(uname)" in + Linux) + LDFLAGS='-m64' + ln -s make.linux64 make.include + ;; + Darwin) + LDFLAGS='-arch x86_64 -m64' + cp -a make.darwinmavericks make.include + + sed -i -e '/^ZZ/ s/$$/ -arch x86_64/' \ + -e '/^AA/ s/$$/ -arch x86_64/' make.include + sed -i -e '/CODESIGN =/c \ + CODESIGN = echo' make.include + ;; + *) + echo "Unsupported" + exit 1 + ;; + esac + + + make mkdir -p $$PREFIX/bin cp -a bin/ds9* bin/x* $$PREFIX/bin windows : diff --git a/sextractor/sextractor-generic.ini b/sextractor/sextractor-generic.ini index b85bf8f..66fb558 100644 --- a/sextractor/sextractor-generic.ini +++ b/sextractor/sextractor-generic.ini @@ -17,23 +17,41 @@ number : 0 [requirements] build : - #gcc >=4.6 [darwin] + #gcc >=4.6 [osx] fftw pkgconfig - atlas-generic + atlas-generic [osx] run : fftw - atlas-generic + atlas-generic [osx] #none [cbc_build] linux : + ATLAS=/usr + LIBDIR=lib + case $$(uname) in + Linux) + if [[ $$(uname -m) == *x86_64* ]]; then + LIBDIR=lib64/atlas + else + LIBDIR=lib/atlas + fi + ;; + Darwin) + ATLAS=/usr/local/atlas + ;; + *) + ;; + esac + ./configure --prefix=$$PREFIX \ --with-fftw-libdir=$$PREFIX/lib \ --with-fftw-incdir=$$PREFIX/include \ - --with-atlas-libdir=$$PREFIX/lib \ - --with-atlas-incdir=$$PREFIX/include + --with-atlas-libdir="$$ATLAS/$$LIBDIR" \ + --with-atlas-incdir="$$ATLAS/include" + make -j $${CPU_COUNT} make install windows : diff --git a/sextractor/sextractor.ini b/sextractor/sextractor.ini index 30918e3..647d3e5 100644 --- a/sextractor/sextractor.ini +++ b/sextractor/sextractor.ini @@ -26,11 +26,28 @@ run : [cbc_build] linux : + ATLAS=/usr + LIBDIR=lib + case $$(uname) in + Linux) + if [[ $$(uname -m) == *x86_64* ]]; then + LIBDIR=lib64/atlas + else + LIBDIR=lib/atlas + fi + ;; + Darwin) + ATLAS=/usr/local/atlas + ;; + *) + ;; + esac + ./configure --prefix=$$PREFIX \ --with-fftw-libdir=$$PREFIX/lib \ --with-fftw-incdir=$$PREFIX/include \ - --with-atlas-libdir='/usr/local/atlas/lib' \ - --with-atlas-incdir='/usr/local/atlas/include' + --with-atlas-libdir="$$ATLAS/$$LIBDIR" \ + --with-atlas-incdir="$$ATLAS/include" make -j $${CPU_COUNT} make install windows : diff --git a/stsci/stsci.ini b/stsci/stsci.ini index 4ef1958..ec72d47 100644 --- a/stsci/stsci.ini +++ b/stsci/stsci.ini @@ -48,7 +48,7 @@ run : imexam [py27] nictools [py34] nictools [py27] - photutils [py34] + #photutils [py34] photutils [py27] poppy [py34] poppy [py27] @@ -101,8 +101,10 @@ run : #3rd-party - atlas-generic - sextractor-generic + atlas-generic [osx] + sextractor-generic [osx] + + sextractor [linux] #Standard anaconda [py34] |