Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update bazel to v2.0.0 #33

Merged
merged 12 commits into from
Feb 6, 2020
2 changes: 2 additions & 0 deletions .ci_support/linux_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@ cxx_compiler_version:
- '7'
docker_image:
- condaforge/linux-anvil-comp7


2 changes: 1 addition & 1 deletion .ci_support/osx_.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
- '10.12'
c_compiler:
- clang
c_compiler_version:
Expand Down
2 changes: 2 additions & 0 deletions recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
MACOSX_DEPLOYMENT_TARGET: # [osx]
- '10.12' # [osx]
12 changes: 0 additions & 12 deletions recipe/fix_path.patch

This file was deleted.

15 changes: 7 additions & 8 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,29 +1,28 @@
{% set version = "0.21.0" %}
{% set version = "2.0.0" %}

package:
name: bazel
version: {{ version }}

source:
url: https://github.com/bazelbuild/bazel/releases/download/{{ version }}/bazel-{{ version }}-dist.zip
sha256: 6ccb831e683179e0cfb351cb11ea297b4db48f9eab987601c038aa0f83037db4
patches:
- xcode_locator.patch # [osx]
- fix_path.patch # [linux]
sha256: 724da3c656f68e787a86ebb9844773aa1c2e3a873cc39462a8f1b336153d6cbb

build:
number: 0
ignore_prefix_files: True
binary_relocation: False
skip: True # [win]
missing_dso_whitelist:
- '*'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this be made more explicit? White listing everything (like is done here) essentially skips the under/overlinking check.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jjhelmus turns out missing_dso_whitelist was not needed so it's now removed from the recipe.


requirements:
build:
- {{ compiler('c') }}
- {{ compiler('cxx') }}
- openjdk >=8,<11
- unzip # [linux]
- zip # [linux]
- openjdk >=8
- unzip
- zip
run:
- openjdk >=8

Expand Down
120 changes: 0 additions & 120 deletions recipe/xcode_locator.patch

This file was deleted.