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.10.0 #14

Closed
wants to merge 6 commits into from
Closed

cargo-c v0.10.0 #14

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5eab2dc
updated v0.10.0
regro-cf-autotick-bot Jun 18, 2024
d5726df
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and co…
regro-cf-autotick-bot Jun 18, 2024
bbdbdf3
BLD: Port changes from previous PRs related to libgit2
carterbox Jun 18, 2024
e67c190
MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.36.2, and co…
carterbox Jun 18, 2024
10eba39
BLD: Remove old macos sdk spec
carterbox Jun 18, 2024
a3f0996
BLD: Try to help rust find libgit2
carterbox Jun 18, 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.

3 changes: 2 additions & 1 deletion .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.

11 changes: 10 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,6 +2,10 @@ c_compiler:
- gcc
c_compiler_version:
- '12'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos6
channel_sources:
Expand All @@ -12,11 +16,16 @@ docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libcurl:
- '8'
libgit2:
- '1.8'
openssl:
- '3'
rust_compiler:
- rust
target_platform:
- linux-64
zip_keys:
- - c_stdlib_version
- cdt_name
zlib:
- '1.2'
- '1'
11 changes: 10 additions & 1 deletion .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 @@ -16,11 +20,16 @@ docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libcurl:
- '8'
libgit2:
- '1.8'
openssl:
- '3'
rust_compiler:
- rust
target_platform:
- linux-aarch64
zip_keys:
- - c_stdlib_version
- cdt_name
zlib:
- '1.2'
- '1'
13 changes: 11 additions & 2 deletions .ci_support/linux_ppc64le_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,30 @@ 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'
libgit2:
- '1.8'
openssl:
- '3'
rust_compiler:
- rust
target_platform:
- linux-ppc64le
zip_keys:
- - c_stdlib_version
- cdt_name
zlib:
- '1.2'
- '1'
12 changes: 9 additions & 3 deletions .ci_support/osx_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,23 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
- '10.13'
MACOSX_SDK_VERSION:
- '10.12'
- '10.13'
c_compiler:
- clang
c_compiler_version:
- '16'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.13'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
libcurl:
- '8'
libgit2:
- '1.8'
macos_machine:
- x86_64-apple-darwin13.4.0
openssl:
Expand All @@ -21,4 +27,4 @@ rust_compiler:
target_platform:
- osx-64
zlib:
- '1.2'
- '1'
10 changes: 9 additions & 1 deletion .ci_support/osx_arm64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,23 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
MACOSX_SDK_VERSION:
- '11.0'
c_compiler:
- clang
c_compiler_version:
- '16'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '11.0'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
libcurl:
- '8'
libgit2:
- '1.8'
macos_machine:
- arm64-apple-darwin20.0.0
openssl:
Expand All @@ -19,4 +27,4 @@ rust_compiler:
target_platform:
- osx-arm64
zlib:
- '1.2'
- '1'
4 changes: 4 additions & 0 deletions .ci_support/win_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
c_compiler:
- vs2019
c_stdlib:
- vs
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
libgit2:
- '1.8'
rust_compiler:
- rust
target_platform:
Expand Down
4 changes: 2 additions & 2 deletions .gitattributes
View file
Open in desktop

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

13 changes: 10 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.

13 changes: 10 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.

9 changes: 7 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.

3 changes: 1 addition & 2 deletions conda-forge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
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
Expand Down
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
3 changes: 3 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,5 @@
MACOSX_SDK_VERSION: # [osx and x86_64]
- "10.12" # [osx and x86_64]
carterbox marked this conversation as resolved.
Show resolved Hide resolved
# libgit2 on conda-forge requires glibc >=2.14
c_stdlib_version: # [linux]
- 2.17 # [linux]
Loading
Loading