diff options
| author | Joseph Hunkeler <jhunk@stsci.edu> | 2015-12-11 00:31:18 -0500 |
|---|---|---|
| committer | Joseph Hunkeler <jhunk@stsci.edu> | 2015-12-11 00:31:18 -0500 |
| commit | 4f688a09b085a0e9283c853a98eefdd53d4ba967 (patch) | |
| tree | 4cd052af42bddfdb2688391f3ca666d8980ba01b | |
| parent | 633dde17b85e7ccd27e86f67d603ba432e2f6735 (diff) | |
| parent | 8ac24819221e7142a65e95b5e36a91535194e01d (diff) | |
| download | cbc-recipes-4f688a09b085a0e9283c853a98eefdd53d4ba967.tar.gz | |
Merge branch 'master' of bitbucket.org:jhunkeler/cbc-recipes
| -rw-r--r-- | hstcal/hstcal.ini | 2 | ||||
| -rw-r--r-- | pyfftw/pyfftw.ini | 7 | ||||
| -rw-r--r-- | sextractor/sextractor.ini | 15 |
3 files changed, 17 insertions, 7 deletions
diff --git a/hstcal/hstcal.ini b/hstcal/hstcal.ini index 2cdb83f..e55b6fc 100644 --- a/hstcal/hstcal.ini +++ b/hstcal/hstcal.ini @@ -20,7 +20,7 @@ number : {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} build : gcc >=4.6 [osx] run : - # + libgcc >=4.6 [osx] [test] imports : diff --git a/pyfftw/pyfftw.ini b/pyfftw/pyfftw.ini index 3139f13..ed620bd 100644 --- a/pyfftw/pyfftw.ini +++ b/pyfftw/pyfftw.ini @@ -20,8 +20,9 @@ build : numpy >=1.9 fftw cython - setuptools - python + pkg-config [osx] + setuptools + python run : numpy >=1.9 fftw @@ -31,7 +32,7 @@ run : linux : export CFLAGS="`pkg-config --cflags fftw3`" export LDFLAGS="`pkg-config --libs fftw3`" - python setup.py install || exit 1 + python setup.py install || exit 1 windows : # You're on your own with the libraries, it seems. python setup.py install diff --git a/sextractor/sextractor.ini b/sextractor/sextractor.ini index 911f8b0..7a6785b 100644 --- a/sextractor/sextractor.ini +++ b/sextractor/sextractor.ini @@ -17,6 +17,8 @@ number : 0 [requirements] build : atlas-generic [linux] + autoconf [osx] + m4 [osx] fftw pkgconfig @@ -36,10 +38,18 @@ linux : else LIBDIR=lib/atlas fi + export OPTIONS="--with-atlas-libdir=$$PREFIX/lib --with-atlas-incdir=$$PREFIX/include" ;; Darwin) + # Do patches (see also homebrew sextractor recipe) + curl https://gist.githubusercontent.com/mwcraig/ae66eadcd0f266e7138f/raw/f4625508784e75c7b3ce11d8a578589425533282/acx_accelerate.m4.diff | patch -p1 -i - + curl https://gist.githubusercontent.com/mwcraig/4f61431f177b6cc0085a/raw/bf4d29a7a51ccec1ef224006fd10ac260a31c37c/configure.ac.diff | patch -p1 -i - + curl https://gist.githubusercontent.com/mwcraig/b423656698987b6bc492/raw/f23c4b50d972de4e7902fe3d4fa1363400a98f8f/pattern.c.diff | patch -p1 -i - + ATLAS=/usr/local/atlas - OPTIONS="--enable-accelerate" + export OPTIONS="--enable-accelerate" + autoconf + autoheader ;; *) ;; @@ -48,12 +58,11 @@ linux : ./configure --prefix=$$PREFIX \ --with-fftw-libdir=$$PREFIX/lib \ --with-fftw-incdir=$$PREFIX/include \ - --with-atlas-libdir=$$PREFIX/lib \ - --with-atlas-incdir=$$PREFIX/include \ "$${OPTIONS}" make -j $${CPU_COUNT} make install + windows : echo Unsupported |