Merge pull request #12 from ilastik/ilastik

conda recipe updates
svenpeter42 · Aug 14, 2017 · 1f8d11a · 1f8d11a
2 parents f3d6f82 + 09a6fb7
commit 1f8d11a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/pkg/conda/fastfilters/build.sh b/pkg/conda/fastfilters/build.sh
@@ -1,5 +1,14 @@
 #!/bin/bash
 
+if [ $(uname) == Darwin ]; then
+    CC=clang
+    CXX=clang++
+    CXXFLAGS="-stdlib=libc++"
+else
+    CC=gcc
+    CXX=g++
+fi
+
 mkdir build_conda
 cd build_conda
 cmake -DCMAKE_INSTALL_PREFIX=${PREFIX} ..

diff --git a/pkg/conda/fastfilters/meta.yaml b/pkg/conda/fastfilters/meta.yaml
@@ -20,15 +20,14 @@ build:
 
 requirements:
   build:
-    - gcc 4.8.5 # [unix]
-    - python 2.7*|3.4*|3.5*
+    - cmake
+    - python 2.7*|3.4*|3.5*|3.6*
     - python {{PY_VER}}*
     - numpy
     - nose
     - vigra
 
   run:
-    - libgcc 4.8* # [unix]
     - python {{PY_VER}}*
     - numpy