Skip to content

Commit

Permalink
Merge pull request conda-forge#15 from ocefpaf/pin_zlib
Browse files Browse the repository at this point in the history
Pin zlib
  • Loading branch information
ocefpaf authored Nov 15, 2017
2 parents d0d21b2 + a1ae25d commit 7afc739
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ To manage the continuous integration and simplify feedstock maintenance
Using the ``conda-forge.yml`` within this repository, it is possible to re-render all of
this feedstock's supporting files (e.g. the CI configuration files) with ``conda smithy rerender``.

For more information please check the [conda-forge documentation](https://conda-forge.org/docs/).

Terminology
===========
Expand Down Expand Up @@ -100,4 +101,4 @@ In order to produce a uniquely identifiable distribution:
the [``build/number``](http://conda.pydata.org/docs/building/meta-yaml.html#build-number-and-string).
* If the version of a package **is** being increased, please remember to return
the [``build/number``](http://conda.pydata.org/docs/building/meta-yaml.html#build-number-and-string)
back to 0.
back to 0.
15 changes: 7 additions & 8 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ package:
version: {{ version }}

source:
fn: {{ filename }}
url: https://dl.bintray.com/boostorg/release/{{ version }}/source/{{ filename }}
sha256: 9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81
patches:
Expand All @@ -18,26 +17,26 @@ source:
- more-msvc-fixes.patch

build:
number: 0
skip: true # [win and py>35]
number: 1
skip: true # [win and py36]
features:
- vc9 # [win and py27]
- vc14 # [win and py35]
- vc14 # [win and (py35 or py36)]

requirements:
build:
- toolchain
- python # [win]
- icu 58.* # [unix]
- bzip2 1.0.* # [unix]
- zlib 1.2.*
- zlib 1.2.11
- vc 9 # [win and py27]
- vc 14 # [win and py35]

run:
- icu 58.* # [unix]
- bzip2 1.0.* # [unix]
- zlib 1.2.*
- zlib 1.2.11
- vc 9 # [win and py27]
- vc 14 # [win and py35]

Expand Down Expand Up @@ -99,8 +98,8 @@ test:
- if not exist %PREFIX%\\Library\\lib\\boost_{{ each_boost_lib }}-vc100-mt-{{ win_vstr }}.lib exit 1 # [win and py34]
- if not exist %PREFIX%\\Library\\lib\\boost_{{ each_boost_lib }}-vc140-mt-{{ win_vstr }}.lib exit 1 # [win and py35]
{% endfor %}
- conda inspect linkages -p $PREFIX boost-cpp # [not win]
- conda inspect objects -p $PREFIX boost-cpp # [osx]
- conda inspect linkages -p $PREFIX $PKG_NAME # [not win]
- conda inspect objects -p $PREFIX $PKG_NAME # [osx]

about:
home: http://www.boost.org/
Expand Down

0 comments on commit 7afc739

Please sign in to comment.