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

Jump to bottom

Do not override CMake's platform-dependent CFLAGS #91

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Do not override CMake's platform-dependent CFLAGS #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
03e1138
Do not override CMake's platform-dependent CFLAGS
hattne Apr 25, 2024
614fa0f
MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.34.1, and co…
hattne Apr 25, 2024
8904c7f
Bump build number
hattne Apr 26, 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
1 change: 1 addition & 0 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 @@ -4,6 +4,10 @@ c_compiler:
- gcc
c_compiler_version:
- '12'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
cdt_name:
- cos6
channel_sources:
Expand All @@ -13,7 +17,7 @@ channel_targets:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libxml2:
- '2.12'
- '2'
lz4_c:
- 1.9.3
lzo:
Expand All @@ -24,6 +28,9 @@ target_platform:
- linux-64
xz:
- '5'
zip_keys:
- - c_stdlib_version
- cdt_name
zlib:
- '1.2'
zstd:
Expand Down
9 changes: 8 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 @@ -6,6 +6,10 @@ c_compiler:
- gcc
c_compiler_version:
- '12'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_arch:
- aarch64
cdt_name:
Expand All @@ -17,7 +21,7 @@ channel_targets:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libxml2:
- '2.12'
- '2'
lz4_c:
- 1.9.3
lzo:
Expand All @@ -28,6 +32,9 @@ target_platform:
- linux-aarch64
xz:
- '5'
zip_keys:
- - c_stdlib_version
- cdt_name
zlib:
- '1.2'
zstd:
Expand Down
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 @@ -4,6 +4,10 @@ c_compiler:
- gcc
c_compiler_version:
- '12'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
channel_sources:
Expand All @@ -13,7 +17,7 @@ channel_targets:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libxml2:
- '2.12'
- '2'
lz4_c:
- 1.9.3
lzo:
Expand All @@ -24,6 +28,9 @@ target_platform:
- linux-ppc64le
xz:
- '5'
zip_keys:
- - c_stdlib_version
- cdt_name
zlib:
- '1.2'
zstd:
Expand Down
7 changes: 0 additions & 7 deletions .ci_support/migrations/libxml2212.yaml
View file
Open in desktop

This file was deleted.

6 changes: 5 additions & 1 deletion .ci_support/osx_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,18 @@ c_compiler:
- clang
c_compiler_version:
- '16'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.9'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
libiconv:
- '1'
libxml2:
- '2.12'
- '2'
lz4_c:
- 1.9.3
lzo:
Expand Down
6 changes: 5 additions & 1 deletion .ci_support/osx_arm64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,18 @@ 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
libiconv:
- '1'
libxml2:
- '2.12'
- '2'
lz4_c:
- 1.9.3
lzo:
Expand Down
4 changes: 3 additions & 1 deletion .ci_support/win_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@ bzip2:
- '1'
c_compiler:
- vs2019
c_stdlib:
- vs
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
libxml2:
- '2.12'
- '2'
lz4_c:
- 1.9.3
lzo:
Expand Down
25 changes: 23 additions & 2 deletions .gitignore
View file
Open in desktop

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

12 changes: 3 additions & 9 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: 6 additions & 0 deletions .scripts/run_docker_build.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.

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.

2 changes: 0 additions & 2 deletions recipe/build_libarchive.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,13 @@ set C99_TO_C89_WRAP_SAVE_TEMPS=1
set C99_TO_C89_WRAP_NO_LINE_DIRECTIVES=1
set C99_TO_C89_CONV_DEBUG_LEVEL=1
:skip_c99_wrap
:: set cflags because NDEBUG is set in Release configuration, which errors out in test suite due to no assert

cmake -G "Ninja" ^
-DCMAKE_INSTALL_PREFIX="%LIBRARY_PREFIX%" ^
%COMPILER% ^
-DCMAKE_BUILD_TYPE=Release ^
-DCMAKE_C_USE_RESPONSE_FILE_FOR_OBJECTS:BOOL=FALSE ^
-DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^
-DCMAKE_C_FLAGS_RELEASE="%CFLAGS%" ^
-DENABLE_CNG=%ENABLE_CNG% ^
.

Expand Down
2 changes: 1 addition & 1 deletion recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ source:
- patches/0007-CMake-VC9-compatibility-ignore-some-warnings.patch

build:
number: 1
number: 2

outputs:
- name: libarchive
Expand Down