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.

Sign up for GitHub

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

cargo-c v0.9.31 #10

Closed
wants to merge 13 commits into from
Closed

cargo-c v0.9.31 #10

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f86cf5a
updated v0.9.31
regro-cf-autotick-bot Mar 22, 2024
da9893f
MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.33.0, and co…
regro-cf-autotick-bot Mar 22, 2024
068d931
REF: Devendor libgit2 from libgit2-rs
carterbox Mar 28, 2024
c7a33e4
MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.34.0, and co…
carterbox Mar 28, 2024
f0408f2
BLD: Update glibc minimum version for libgit2
carterbox Mar 28, 2024
09d87cc
MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.34.0, and co…
carterbox Mar 28, 2024
902a9ca
REF: Build powerpc natively to avoid wrong compiler use
carterbox Mar 28, 2024
f3ac624
- {{ stdlib("c") }}
hmaarrfk May 5, 2024
9f43878
Update conda_build_config.yaml
hmaarrfk May 5, 2024
484e992
Update meta.yaml
hmaarrfk May 5, 2024
c83c170
Update recipe/conda_build_config.yaml
hmaarrfk May 5, 2024
f9d8f26
Update recipe/meta.yaml
hmaarrfk May 5, 2024
e93c163
MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.35.0, and co…
May 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions .azure-pipelines/azure-pipelines-linux.yml
View file
Open in desktop

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

1 change: 1 addition & 0 deletions .azure-pipelines/azure-pipelines-osx.yml
View file
Open in desktop

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

9 changes: 8 additions & 1 deletion .ci_support/linux_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,12 @@ c_compiler:
- gcc
c_compiler_version:
- '12'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos6
- cos7
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -18,5 +22,8 @@ rust_compiler:
- rust
target_platform:
- linux-64
zip_keys:
- - c_stdlib_version
- cdt_name
zlib:
- '1.2'
7 changes: 7 additions & 0 deletions .ci_support/linux_aarch64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ c_compiler:
- gcc
c_compiler_version:
- '12'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_arch:
- aarch64
cdt_name:
Expand All @@ -22,5 +26,8 @@ rust_compiler:
- rust
target_platform:
- linux-aarch64
zip_keys:
- - c_stdlib_version
- cdt_name
zlib:
- '1.2'
9 changes: 8 additions & 1 deletion .ci_support/linux_ppc64le_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,18 @@ c_compiler:
- gcc
c_compiler_version:
- '12'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
- quay.io/condaforge/linux-anvil-ppc64le
libcurl:
- '8'
openssl:
Expand All @@ -18,5 +22,8 @@ rust_compiler:
- rust
target_platform:
- linux-ppc64le
zip_keys:
- - c_stdlib_version
- cdt_name
zlib:
- '1.2'
4 changes: 4 additions & 0 deletions .ci_support/osx_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ c_compiler:
- clang
c_compiler_version:
- '16'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.9'
channel_sources:
- conda-forge
channel_targets:
Expand Down
4 changes: 4 additions & 0 deletions .ci_support/osx_arm64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ c_compiler:
- clang
c_compiler_version:
- '16'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '11.0'
channel_sources:
- conda-forge
channel_targets:
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/win_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
c_compiler:
- vs2019
c_stdlib:
- vs
channel_sources:
- conda-forge
channel_targets:
Expand Down
6 changes: 3 additions & 3 deletions .scripts/build_steps.sh
View file
Open in desktop

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

6 changes: 3 additions & 3 deletions .scripts/run_osx_build.sh
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions .scripts/run_win_build.bat
View file
Open in desktop

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

25 changes: 25 additions & 0 deletions .travis.yml
View file
Open in desktop

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

9 changes: 8 additions & 1 deletion README.md
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions azure-pipelines.yml
View file
Open in desktop

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

5 changes: 3 additions & 2 deletions build-locally.py
View file
Open in desktop

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

5 changes: 3 additions & 2 deletions conda-forge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
provider:
linux_aarch64: azure
linux_ppc64le: azure
linux_ppc64le: default
build_platform:
linux_aarch64: linux_64
linux_ppc64le: linux_64
osx_arm64: osx_64
github:
branch_name: main
tooling_branch_name: main
conda_build:
error_overlinking: true
conda_forge_output_validation: true
os_version:
linux_64: cos7
2 changes: 2 additions & 0 deletions recipe/bld.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
echo ON

set "LIBGIT2_NO_VENDOR=1"

cargo install --path . --root %LIBRARY_PREFIX%
if errorlevel 1 exit 1

Expand Down
2 changes: 2 additions & 0 deletions recipe/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
set -o xtrace -o nounset -o pipefail -o errexit

export LIBGIT2_NO_VENDOR=1

# Required for cross-compiling with pkg-config
export PKG_CONFIG_SYSROOT_DIR=$PREFIX
export PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig
Expand Down
2 changes: 2 additions & 0 deletions recipe/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
MACOSX_SDK_VERSION: # [osx and x86_64]
- "10.12" # [osx and x86_64]
c_stdlib_version: # [linux]
hmaarrfk marked this conversation as resolved.
Show resolved Hide resolved
- 2.17 # [linux]
6 changes: 4 additions & 2 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
{% set version = "0.9.30" %}
{% set version = "0.9.31" %}

package:
name: cargo-c
version: {{ version }}

source:
url: https://github.com/lu-zero/cargo-c/archive/refs/tags/v{{ version }}.tar.gz
sha256: 174cfc3a69263c3e54b95e00c4bd61b13377f7f72d4bf60aa714fd9e7ed3849c
sha256: 4a04db8fb17a55db403bc59572f05475a477fece7ab08cfb2de970e188b80b83

build:
number: 0

requirements:
build:
- {{ compiler('c') }}
- {{ stdlib("c") }}
- {{ compiler('rust') }}
hmaarrfk marked this conversation as resolved.
Show resolved Hide resolved
- cargo-bundle-licenses
hmaarrfk marked this conversation as resolved.
Show resolved Hide resolved
- pkg-config
Expand All @@ -22,6 +23,7 @@ requirements:
- zlib # [not win]
host:
- libcurl # [not win]
- libgit2 >=1.7.2,<1.8.0
- openssl # [not win]
Copy link
Contributor

Choose a reason for hiding this comment

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

why is this here? is it not compatible with 1.8.0?

Copy link
Contributor

Choose a reason for hiding this comment

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

https://github.com/rust-lang/git2-rs/pull/1032/files

it seems it just isn't compatible yet.

Copy link
Contributor

Choose a reason for hiding this comment

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

Truthfully, for me this is the larger issue given that libgit2 has already moved to 1.8 conda-forge wide and this might cause some conflicts.

- zlib # [not win]
run:
Expand Down
Loading