Skip to content

Commit

Permalink
use default c compiler and add third party licenses (#44)
Browse files Browse the repository at this point in the history
automerged PR by conda-forge/automerge-action
  • Loading branch information
github-actions[bot] authored Aug 6, 2024
2 parents d0c9085 + 5e425e1 commit fa3ee57
Show file tree
Hide file tree
Showing 14 changed files with 51 additions and 34 deletions.
2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-win.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ c_compiler_version:
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
- '2.17'
cdt_name:
- cos6
- cos7
channel_sources:
- conda-forge
channel_targets:
Expand Down
2 changes: 0 additions & 2 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,5 @@ channel_targets:
- conda-forge main
macos_machine:
- x86_64-apple-darwin13.4.0
openssl:
- '3'
target_platform:
- osx-64
2 changes: 0 additions & 2 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,5 @@ channel_targets:
- conda-forge main
macos_machine:
- arm64-apple-darwin20.0.0
openssl:
- '3'
target_platform:
- osx-arm64
6 changes: 2 additions & 4 deletions .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
c_compiler:
- vs2019
c_stdlib:
- vs
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
m2w64_c_compiler:
- m2w64-toolchain
openssl:
- '3'
target_platform:
- win-64
2 changes: 1 addition & 1 deletion .github/CODEOWNERS

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .scripts/build_steps.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 8 additions & 1 deletion .scripts/run_osx_build.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .scripts/run_win_build.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions build-locally.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 7 additions & 6 deletions recipe/bld.bat
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
:: build
cargo install --locked --features=all --root "%PREFIX%" --path . || goto :error
set "CARGO_PROFILE_RELEASE_STRIP=symbols"
set "CARGO_PROFILE_RELEASE_LTO=true"
set "CARGO_PROFILE_RELEASE_CODEGEN_UNITS=1"

:: strip debug symbols
strip "%PREFIX%\bin\sccache.exe" || goto :error
:: build
cargo install --locked --features=all --root "%PREFIX%" --path . --no-track || goto :error

:: remove extra build file
del /F /Q "%PREFIX%\.crates.toml"
:: generate licenses
cargo-bundle-licenses --format yaml --output THIRDPARTY.yml

goto :EOF

Expand Down
13 changes: 7 additions & 6 deletions recipe/build.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
#!/usr/bin/env bash

# build statically linked binary with Rust
cargo install --locked --features=all --root "$PREFIX" --path .
export CARGO_PROFILE_RELEASE_STRIP=symbols
export CARGO_PROFILE_RELEASE_LTO=true
export CARGO_PROFILE_RELEASE_CODEGEN_UNITS=1

# strip debug symbols
"$STRIP" "$PREFIX/bin/sccache"
# build statically linked binary with Rust
cargo install --locked --features=all --root "$PREFIX" --path . --no-track

# remove extra build file
rm -f "${PREFIX}/.crates.toml"
# generate licenses
cargo-bundle-licenses --format yaml --output THIRDPARTY.yml
16 changes: 9 additions & 7 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,18 @@ source:
sha256: 30b951b49246d5ca7d614e5712215cb5f39509d6f899641f511fb19036b5c4e5

build:
number: 0
number: 1
missing_dso_whitelist: # [osx]
- /usr/lib/libresolv.9.dylib # [osx]

requirements:
build:
- rust
- {{ compiler('c') }} # [not win]
- {{ stdlib("c") }} # [not win]
- {{ compiler('m2w64_c') }} # [win]
- {{ stdlib("c") }} # [win]
- {{ compiler('c') }}
- {{ stdlib("c") }}
- cargo-bundle-licenses
host:
- openssl
- openssl # [linux]

test:
commands:
Expand All @@ -32,7 +31,9 @@ about:
home: https://github.com/mozilla/sccache
summary: sccache is ccache with cloud storage
license: Apache-2.0
license_file: LICENSE
license_file:
- LICENSE
- THIRDPARTY.yml
license_family: APACHE
description: |
Sccache is a ccache-like tool. It is used as a compiler wrapper and avoids
Expand All @@ -47,3 +48,4 @@ extra:
- luizirber
- wolfv
- jonashaag
- baszalmstra

1 comment on commit fa3ee57

@conda-forge-webservices
Copy link
Contributor

Choose a reason for hiding this comment

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

Hi! This is the friendly automated conda-forge-webservice.

I updated the Github team because of this commit.

  • @baszalmstra was added to this feedstock maintenance team.

You should get push access to this feedstock and CI services.

Your package won't be available for installation locally until it is built
and synced to the anaconda.org CDN (takes 1-2 hours after the build finishes).

Feel free to join the community Element channel.

NOTE: Please make sure to not push to the repository directly.
Use branches in your fork for any changes and send a PR.
More details on this are here.

Please sign in to comment.