Skip to content

Backport cmake fix #85

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

Merged
h-vetinari merged 3 commits into from
Feb 19, 2025
Merged

Backport cmake fix #85

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
2390ff4
backport candidate fix for breakage in arrow
h-vetinari Feb 19, 2025
5296b91
publish builds to separate label
h-vetinari Feb 19, 2025
d9119df
MNT: Re-rendered with conda-build 25.1.2, conda-smithy 3.45.5.dev18+g…
h-vetinari Feb 19, 2025
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
4 changes: 2 additions & 2 deletions .ci_support/linux_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ cdt_name:
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
- conda-forge orc_dev
cxx_compiler:
- gxx
cxx_compiler_version:
Expand All @@ -23,7 +23,7 @@ libprotobuf:
lz4_c:
- '1.10'
orc:
- 2.0.3
- 2.1.0
snappy:
- '1.2'
target_platform:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/linux_aarch64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ cdt_name:
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
- conda-forge orc_dev
cxx_compiler:
- gxx
cxx_compiler_version:
Expand All @@ -23,7 +23,7 @@ libprotobuf:
lz4_c:
- '1.10'
orc:
- 2.0.3
- 2.1.0
snappy:
- '1.2'
target_platform:
Expand Down
4 changes: 2 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 @@ -11,7 +11,7 @@ cdt_name:
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
- conda-forge orc_dev
cxx_compiler:
- gxx
cxx_compiler_version:
Expand All @@ -23,7 +23,7 @@ libprotobuf:
lz4_c:
- '1.10'
orc:
- 2.0.3
- 2.1.0
snappy:
- '1.2'
target_platform:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ c_stdlib_version:
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
- conda-forge orc_dev
cxx_compiler:
- clangxx
cxx_compiler_version:
Expand All @@ -25,7 +25,7 @@ lz4_c:
macos_machine:
- x86_64-apple-darwin13.4.0
orc:
- 2.0.3
- 2.1.0
snappy:
- '1.2'
target_platform:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_arm64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ c_stdlib_version:
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
- conda-forge orc_dev
cxx_compiler:
- clangxx
cxx_compiler_version:
Expand All @@ -25,7 +25,7 @@ lz4_c:
macos_machine:
- arm64-apple-darwin20.0.0
orc:
- 2.0.3
- 2.1.0
snappy:
- '1.2'
target_platform:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/win_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ c_stdlib:
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
- conda-forge orc_dev
cxx_compiler:
- vs2019
libprotobuf:
- 5.28.3
lz4_c:
- '1.10'
orc:
- 2.0.3
- 2.1.0
snappy:
- '1.2'
target_platform:
Expand Down
16 changes: 8 additions & 8 deletions README.md
View file
Open in desktop

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

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
@@ -0,0 +1,2 @@
channel_targets:
conda-forge orc_dev
4 changes: 3 additions & 1 deletion recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@ source:
patches:
- patches/0001-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch
- patches/0002-Allow-user-to-override-path-to-protoc.patch
# backport https://github.com/apache/orc/pull/2108
- patches/0003-ORC-1833-C-Fix-CMake-script-to-be-used-inside-anothe.patch

build:
number: 0
number: 1
run_exports:
- {{ pin_subpackage("orc", max_pin="x.x.x") }}

Expand Down
7 changes: 2 additions & 5 deletions recipe/patches/0001-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From da2b1323557fcb0016b4b4b3fe35652c06acaeea Mon Sep 17 00:00:00 2001
From 2da6a76b50e719d2aec9dd46fb640c524455b1fd Mon Sep 17 00:00:00 2001
From: Nehal J Wani <nehaljw.kkd1@gmail.com>
Date: Fri, 25 Sep 2020 14:49:59 -0400
Subject: [PATCH 1/2] Don't force orc to be a static library, let end user
Subject: [PATCH 1/3] Don't force orc to be a static library, let end user
control it

---
Expand All @@ -21,6 +21,3 @@ index 694667c06..175c032ca 100644

target_link_libraries (orc
INTERFACE
--
2.47.1

7 changes: 2 additions & 5 deletions recipe/patches/0002-Allow-user-to-override-path-to-protoc.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 68461edc1331b57f1cc130e6c084174de2d88bdd Mon Sep 17 00:00:00 2001
From 86e901e9e6a035b4bd01a22bd8a48f3dd4443b8a Mon Sep 17 00:00:00 2001
From: Nehal J Wani <nehaljw.kkd1@gmail.com>
Date: Sat, 1 Feb 2025 18:53:55 +0000
Subject: [PATCH 2/2] Allow user to override /path/to/protoc
Subject: [PATCH 2/3] Allow user to override /path/to/protoc

Useful for cross-compilation
---
Expand All @@ -24,6 +24,3 @@ index ca91fb5ad..cf02a1199 100644

get_target_property (target_type protobuf::libprotobuf TYPE)
if (target_type STREQUAL "STATIC_LIBRARY")
--
2.47.1

Loading