conda: Update recipes to use features

mpi4py · Jun 7, 2016 · 200b86f · 200b86f
1 parent fccb7fb
commit 200b86f
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 7 deletions.
diff --git a/conf/anaconda/mpi4py/meta.yaml b/conf/anaconda/mpi4py/meta.yaml
@@ -1,6 +1,6 @@
 {% set build = 0 %}
 {% set mpi = (environ.get('MPI') or 'mpich') if not win else 'msmpi' %}
-{% set mpi_version = {'mpich':'>=3.1', 'openmpi':'>=1.8'}.get(mpi,'') %}
+{% set mpi_version = {'mpich':'>=3.2', 'openmpi':'>=1.10'}.get(mpi,'') %}
 
 package:
   name: mpi4py
@@ -28,6 +28,7 @@ requirements:
 build:
   number: {{build}}
   string: py{{py}}_{{mpi}}_{{build}}
+  features: {{mpi}} # [not win]
   script: '$PYTHON  setup.py install' # [not win]
   script: '%PYTHON% setup.py install' # [win]
 

diff --git a/conf/conda-recipes/mpi4py/meta.yaml b/conf/conda-recipes/mpi4py/meta.yaml
@@ -1,8 +1,8 @@
-{% set build = 2 %}
+{% set build = 3 %}
 {% set version = '2.0.0' %}
 {% set md5 = '4f7d8126d7367c239fd67615680990e3' %}
 {% set mpi = (environ.get('MPI') or 'mpich') if not win else 'msmpi' %}
-{% set mpi_version = {'mpich':'>=3.1', 'openmpi':'>=1.8'}.get(mpi,'') %}
+{% set mpi_version = {'mpich':'>=3.2', 'openmpi':'>=1.10'}.get(mpi,'') %}
 
 package:
   name: mpi4py
@@ -29,6 +29,8 @@ requirements:
 build:
   number: {{build}}
   string: py{{py}}_{{mpi}}_{{build}}
+  features:
+    - {{mpi}}
   script: '$PYTHON  setup.py install' # [not win]
   script: '%PYTHON% setup.py install' # [win]
 

diff --git a/conf/conda-recipes/mpich/build.sh b/conf/conda-recipes/mpich/build.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+export CC=${CC-cc}
+export CXX=${CXX-c++}
 ./configure \
   --disable-fortran \
   --disable-dependency-tracking \

diff --git a/conf/conda-recipes/mpich/meta.yaml b/conf/conda-recipes/mpich/meta.yaml
@@ -18,10 +18,14 @@ source:
   md5: f414cfa77099cd1fa1a5ae4e22db508a
 
 build:
-  number: 1
+  number: 2
+  features:
+    - mpich
+  track_features:
+    - mpich
+  skip: true # [win]
   binary_relocation: true
   detect_binary_files_with_prefix: true
-  skip: true # [win]
 
 test:
   files:

diff --git a/conf/conda-recipes/openmpi/build.sh b/conf/conda-recipes/openmpi/build.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+export CC=${CC-cc}
+export CXX=${CXX-c++}
 ./configure \
   --disable-mpi-fortran \
   --disable-dependency-tracking \

diff --git a/conf/conda-recipes/openmpi/meta.yaml b/conf/conda-recipes/openmpi/meta.yaml
@@ -18,10 +18,14 @@ source:
   md5: b2f43d9635d2d52826e5ef9feb97fd4c
 
 build:
-  number: 1
+  number: 2
+  features:
+    - openmpi
+  track_features:
+    - openmpi
+  skip: true # [win]
   binary_relocation: true
   detect_binary_files_with_prefix: true
-  skip: true # [win]
 
 test:
   files: