From e59cb711f80717f702b24c57e75113ee64386b36 Mon Sep 17 00:00:00 2001 From: Jake VanderPlas Date: Wed, 9 Mar 2016 16:27:04 -0800 Subject: [PATCH] fix conda recipe --- conda_recipes/megaman/build.sh | 7 +++++++ conda_recipes/megaman/meta.yaml | 9 ++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/conda_recipes/megaman/build.sh b/conda_recipes/megaman/build.sh index 8e25a14..d8e0410 100644 --- a/conda_recipes/megaman/build.sh +++ b/conda_recipes/megaman/build.sh @@ -1,3 +1,10 @@ #!/bin/bash +# On OSX, we need to ensure we're using conda's gcc/g++ +if [[ `uname` == Darwin ]]; then + export CC=gcc + export LD=gcc + export CXX=g++ +fi + $PYTHON setup.py install diff --git a/conda_recipes/megaman/meta.yaml b/conda_recipes/megaman/meta.yaml index 77ac583..319b6a9 100644 --- a/conda_recipes/megaman/meta.yaml +++ b/conda_recipes/megaman/meta.yaml @@ -1,10 +1,10 @@ package: name: megaman - version: "0.1.dev1" + version: 0.1.1 source: git_url: https://github.com/mmp2/megaman.git - git_tag: 1ddd723f91b40b5309682d2f0e1c92e054085243 + git_tag: v0.1.1 build: number: 1 @@ -12,18 +12,17 @@ build: requirements: build: - python - - gcc [osx] - cython - numpy - flann + - gcc [osx] run: - python - numpy - scipy - scikit-learn - - flann + - pyamg - pyflann - - pyamg # [py27] test: requires: