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 /sextractor | |
| parent | 950119e49cd074efdc7e8e21a2f77ed91798ec41 (diff) | |
| download | cbc-recipes-b36f594450a401300d9f83ea365009cd146ae24f.tar.gz | |
Fix compatibility issues
Diffstat (limited to 'sextractor')
| -rw-r--r-- | sextractor/sextractor-generic.ini | 28 | ||||
| -rw-r--r-- | sextractor/sextractor.ini | 21 |
2 files changed, 42 insertions, 7 deletions
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 : |