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.

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

orc 2.0.1 #11

Merged
merged 151 commits into from
May 30, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
151 commits
Select commit Hold shift + click to select a range
666ea78
Rebuild for libprotobuf314
regro-cf-autotick-bot Dec 4, 2020
8c60f9a
MNT: Re-rendered with conda-build 3.20.5, conda-smithy 3.8.5, and con…
regro-cf-autotick-bot Dec 4, 2020
20de081
Merge pull request #26 from regro-cf-autotick-bot/rebuild-libprotobuf…
nehaljwani Dec 4, 2020
f1ddf6d
updated v1.6.6
regro-cf-autotick-bot Dec 11, 2020
35b37ae
Merge pull request #27 from regro-cf-autotick-bot/1.6.6_h81fa8e
xhochy Dec 11, 2020
a47a781
Rebuild for lz4-c193
regro-cf-autotick-bot Dec 31, 2020
f39da99
MNT: Re-rendered with conda-build 3.20.5, conda-smithy 3.8.6, and con…
regro-cf-autotick-bot Dec 31, 2020
778ec77
Merge pull request #28 from regro-cf-autotick-bot/rebuild-lz4-c193-0-…
xhochy Dec 31, 2020
4b9a6d6
updated v1.6.7
regro-cf-autotick-bot Jan 23, 2021
7ca43e4
MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.8.6, and con…
regro-cf-autotick-bot Jan 23, 2021
2fdf03e
Merge pull request #29 from regro-cf-autotick-bot/1.6.7_h8b69c7
nehaljwani Jan 23, 2021
4e23002
Rebuild for libprotobuf315
regro-cf-autotick-bot Feb 21, 2021
1dca7ea
MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.8.6, and con…
regro-cf-autotick-bot Feb 21, 2021
ddf0635
Merge pull request #30 from regro-cf-autotick-bot/rebuild-libprotobuf…
xhochy Feb 21, 2021
ae87f49
Cross-compile linux-ppc64le
xhochy Feb 21, 2021
3484e24
MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.8.6, and con…
xhochy Feb 21, 2021
2940831
Cross-compile linux-ppc64le
github-actions[bot] Feb 21, 2021
c021172
Rebuild for libprotobuf316
regro-cf-autotick-bot May 7, 2021
09dbeaa
MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.10.1, and co…
regro-cf-autotick-bot May 7, 2021
6776a9e
Merge pull request #32 from regro-cf-autotick-bot/rebuild-libprotobuf…
nehaljwani May 7, 2021
bb9bc86
Rebuild for zstd15
regro-cf-autotick-bot May 16, 2021
bdf38c6
MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.10.1, and co…
regro-cf-autotick-bot May 16, 2021
4e43f0a
Merge pull request #33 from regro-cf-autotick-bot/rebuild-zstd15-0-1_…
nehaljwani May 16, 2021
4af4e40
updated v1.6.8
regro-cf-autotick-bot May 23, 2021
ff04326
Merge pull request #34 from regro-cf-autotick-bot/1.6.8_h3ac01f
nehaljwani May 23, 2021
a63dab0
updated v1.6.9
regro-cf-autotick-bot Jul 3, 2021
094c833
MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.10.3, and co…
regro-cf-autotick-bot Jul 3, 2021
ec3ce58
Merge pull request #35 from regro-cf-autotick-bot/1.6.9_h82ba49
nehaljwani Jul 3, 2021
234eefb
updated v1.6.10
regro-cf-autotick-bot Aug 11, 2021
5d2f4a0
MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.11.0, and co…
regro-cf-autotick-bot Aug 11, 2021
823ec3e
Merge pull request #36 from regro-cf-autotick-bot/1.6.10_he857fd
nehaljwani Aug 11, 2021
55c4bc2
Rebuild for libprotobuf318
regro-cf-autotick-bot Sep 17, 2021
e41d3de
MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.12, and cond…
regro-cf-autotick-bot Sep 17, 2021
96acfa8
Merge pull request #38 from regro-cf-autotick-bot/rebuild-libprotobuf…
nehaljwani Sep 17, 2021
db177f5
Bump version to 1.6.11
nehaljwani Sep 18, 2021
9d441fd
Merge pull request #39 from nehaljwani/1.6.11
nehaljwani Sep 18, 2021
f24f704
Bump version to 1.7.0
nehaljwani Sep 18, 2021
a91cd95
Merge pull request #40 from nehaljwani/1.7.0
nehaljwani Sep 18, 2021
45d619b
updated v1.7.1
regro-cf-autotick-bot Nov 8, 2021
d0f185a
MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.14.3, and co…
regro-cf-autotick-bot Nov 8, 2021
c138688
Merge pull request #41 from regro-cf-autotick-bot/1.7.1_heb990f
nehaljwani Nov 8, 2021
e8a438b
Rebuild for libprotobuf319
regro-cf-autotick-bot Dec 9, 2021
d20afc9
MNT: Re-rendered with conda-build 3.21.7, conda-smithy 3.15.0, and co…
regro-cf-autotick-bot Dec 9, 2021
475125e
Rebuild for libprotobuf319
github-actions[bot] Dec 9, 2021
e7a188f
[ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration Conda…
conda-forge-admin Dec 15, 2021
114b77a
[ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration Conda…
conda-forge-admin Dec 17, 2021
ad7669d
updated v1.7.2
regro-cf-autotick-bot Dec 21, 2021
39700ef
MNT: Re-rendered with conda-build 3.21.7, conda-smithy 3.16.0, and co…
regro-cf-autotick-bot Dec 21, 2021
fe954e4
Merge pull request #43 from regro-cf-autotick-bot/1.7.2_h12270e
nehaljwani Dec 21, 2021
a77fa87
updated v1.7.3
regro-cf-autotick-bot Feb 10, 2022
d2b4efd
MNT: Re-rendered with conda-build 3.21.8, conda-smithy 3.16.2, and co…
regro-cf-autotick-bot Feb 10, 2022
df4591a
Merge pull request #44 from regro-cf-autotick-bot/1.7.3_hb66b8f
nehaljwani Feb 11, 2022
801168b
[ci skip] [skip ci] [cf admin skip] ***NO_CI*** turning off CI for ma…
conda-forge-admin Mar 13, 2022
4aabccc
[ci skip] [skip ci] [cf admin skip] ***NO_CI*** turning on CI for mas…
conda-forge-admin Mar 13, 2022
3d7512d
[ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration Conda…
conda-forge-admin Mar 13, 2022
6071c6d
Rebuild for libprotobuf320
regro-cf-autotick-bot Apr 9, 2022
0ea0baf
MNT: Re-rendered with conda-build 3.21.8, conda-smithy 3.19.0, and co…
regro-cf-autotick-bot Apr 9, 2022
34f7e38
Merge pull request #45 from regro-cf-autotick-bot/rebuild-libprotobuf…
xhochy Apr 9, 2022
bf3a624
updated v1.7.4
regro-cf-autotick-bot Apr 16, 2022
eb9f94d
Merge pull request #46 from regro-cf-autotick-bot/1.7.4_h248d30
xhochy Apr 16, 2022
3ecfba2
Rebuild for lz4_c19
regro-cf-autotick-bot May 18, 2022
ea979c1
MNT: Re-rendered with conda-build 3.21.8, conda-smithy 3.19.0, and co…
regro-cf-autotick-bot May 18, 2022
ed9f412
Merge pull request #47 from regro-cf-autotick-bot/rebuild-lz4_c19-0-1…
xhochy May 18, 2022
624d6cc
updated v1.7.5
regro-cf-autotick-bot Jun 17, 2022
03ced48
MNT: Re-rendered with conda-build 3.21.9, conda-smithy 3.20.0, and co…
regro-cf-autotick-bot Jun 17, 2022
c50b8ee
Merge pull request #48 from regro-cf-autotick-bot/1.7.5_hbaafd0
nehaljwani Jun 17, 2022
2255448
updated v1.7.6
regro-cf-autotick-bot Aug 18, 2022
5046065
MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.1, and co…
regro-cf-autotick-bot Aug 18, 2022
96da2fd
Merge pull request #49 from regro-cf-autotick-bot/1.7.6_h8e2182
xhochy Aug 18, 2022
c4dbc08
Rebuild for libprotobuf321
regro-cf-autotick-bot Aug 27, 2022
fcea238
MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.1, and co…
regro-cf-autotick-bot Aug 27, 2022
8becc96
Merge pull request #50 from regro-cf-autotick-bot/rebuild-libprotobuf…
nehaljwani Aug 27, 2022
0d3bec1
updated v1.8.0
regro-cf-autotick-bot Sep 4, 2022
b9644c9
Merge pull request #51 from regro-cf-autotick-bot/1.8.0_h8e0b7c
nehaljwani Sep 4, 2022
464dbe6
[ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration Conda…
conda-forge-curator[bot] Nov 2, 2022
eee73d5
[ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration DotConda
conda-forge-curator[bot] Nov 17, 2022
69a4218
updated v1.8.1
regro-cf-autotick-bot Dec 3, 2022
75c4923
MNT: Re-rendered with conda-build 3.23.2, conda-smithy 3.22.0, and co…
regro-cf-autotick-bot Dec 3, 2022
c66772b
MNT: Re-rendered with conda-build 3.23.3, conda-smithy 3.22.1, and co…
Dec 7, 2022
3c86c65
Merge pull request #52 from regro-cf-autotick-bot/1.8.1_h091a3c
xhochy Dec 7, 2022
0ebc3c9
updated v1.8.2
regro-cf-autotick-bot Jan 14, 2023
e568a70
Merge pull request #53 from regro-cf-autotick-bot/1.8.2_h5625cf
nehaljwani Jan 14, 2023
9fc0226
Enable Windows Build
nehaljwani Jan 30, 2023
a3916ef
MNT: Re-rendered with conda-build 3.23.3, conda-smithy 3.22.1, and co…
nehaljwani Jan 30, 2023
8e795d6
Add support for Windows (#55)
github-actions[bot] Feb 4, 2023
3e58030
move patches to folder
h-vetinari Feb 5, 2023
5bd63e1
add CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS to ensure import library is created
h-vetinari Feb 5, 2023
e75b414
update tests for windows
h-vetinari Feb 5, 2023
5eb675d
bump build number
h-vetinari Feb 5, 2023
10b0b31
add dev_url
h-vetinari Feb 5, 2023
4f31f94
don't force lib destination
h-vetinari Feb 5, 2023
ecab0ab
Merge pull request #56 from h-vetinari/import
nehaljwani Feb 5, 2023
fb8e7bb
updated v1.8.3
regro-cf-autotick-bot Mar 16, 2023
a353588
MNT: Re-rendered with conda-build 3.23.3, conda-smithy 3.23.0, and co…
regro-cf-autotick-bot Mar 16, 2023
e701edc
Merge pull request #57 from regro-cf-autotick-bot/1.8.3_h8ac4fd
xhochy Mar 16, 2023
103718c
Rebuild for protobuf423
regro-cf-autotick-bot May 27, 2023
916616a
MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.23.1, and co…
regro-cf-autotick-bot May 27, 2023
119b83d
Backport https://github.com/apache/orc/commit/286992e1
nehaljwani May 29, 2023
1eab71f
Use -DPROTOBUF_USE_DLLS on macOS
nehaljwani Jun 4, 2023
abf274c
Check for protobuf config based module
nehaljwani Jun 4, 2023
ebb6c2d
Merge pull request #60 from nehaljwani/protobuf423
nehaljwani Jun 4, 2023
0d0cbe1
updated v1.8.4
regro-cf-autotick-bot Jun 14, 2023
7356c03
Merge pull request #61 from regro-cf-autotick-bot/1.8.4_hdae79d
nehaljwani Jun 14, 2023
6a4f756
updated v1.9.0
regro-cf-autotick-bot Jun 28, 2023
87a910c
Rebase patches for v1.9.0
nehaljwani Jun 29, 2023
82fc75a
orc v1.9.0 (#62)
github-actions[bot] Jun 29, 2023
7729c86
Rebuild for libprotobuf4233_libgrpc156
regro-cf-autotick-bot Jul 1, 2023
ba9dcd4
MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.23.1, and co…
regro-cf-autotick-bot Jul 1, 2023
0b88729
Merge pull request #63 from regro-cf-autotick-bot/rebuild-libprotobuf…
xhochy Jul 1, 2023
0d7fde2
Rebuild for libabseil20230802_libgrpc157_libprotobuf4234
regro-cf-autotick-bot Sep 10, 2023
e962c65
MNT: Re-rendered with conda-build 3.26.1, conda-smithy 3.25.1, and co…
regro-cf-autotick-bot Sep 10, 2023
5bd2672
Merge pull request #66 from regro-cf-autotick-bot/rebuild-libabseil20…
h-vetinari Sep 10, 2023
11a1f71
Rebuild for libgrpc158_libprotobuf4243
regro-cf-autotick-bot Oct 8, 2023
0db60be
MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.27.1, and co…
regro-cf-autotick-bot Oct 8, 2023
0105866
Merge pull request #67 from regro-cf-autotick-bot/rebuild-libgrpc158_…
h-vetinari Oct 8, 2023
414a0df
Rebuild for libgrpc159_libprotobuf4244
regro-cf-autotick-bot Nov 1, 2023
b49b83a
MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.27.1, and co…
regro-cf-autotick-bot Nov 1, 2023
15400ef
Merge pull request #68 from regro-cf-autotick-bot/rebuild-libgrpc159_…
h-vetinari Nov 2, 2023
8b5c0cd
updated v1.9.2
regro-cf-autotick-bot Nov 10, 2023
7b3dcd6
MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.28.0, and co…
regro-cf-autotick-bot Nov 10, 2023
c5875a1
Merge pull request #69 from regro-cf-autotick-bot/1.9.2_hbf4c92
nehaljwani Nov 19, 2023
0cdddf8
Rebuild for libprotobuf 4.25.1
regro-cf-autotick-bot Jan 22, 2024
3cb3fd8
MNT: Re-rendered with conda-build 3.28.4, conda-smithy 3.30.4, and co…
regro-cf-autotick-bot Jan 22, 2024
67e0f9a
Merge pull request #70 from regro-cf-autotick-bot/rebuild-libprotobuf…
xhochy Jan 22, 2024
db5b1a5
Rebuild for libabseil 20240116, libgrp 1.61, libprotobuf 4.25.2
regro-cf-autotick-bot Feb 22, 2024
60e9728
MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.30.4, and co…
regro-cf-autotick-bot Feb 22, 2024
9e4e5e2
Merge pull request #71 from regro-cf-autotick-bot/rebuild-libabseil20…
xhochy Feb 22, 2024
479c29b
Rebuild for libprotobuf 4.25.3
regro-cf-autotick-bot Mar 6, 2024
0adf82d
MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.31.1, and co…
regro-cf-autotick-bot Mar 6, 2024
71adb1b
Merge pull request #72 from regro-cf-autotick-bot/rebuild-libgrpc162_…
h-vetinari Mar 6, 2024
7182c34
updated v2.0.0
regro-cf-autotick-bot Mar 8, 2024
8a46186
rebase patches
xhochy Mar 11, 2024
ee5bfee
Set _LIBCPP_DISABLE_AVAILABILITY on osx
xhochy Mar 11, 2024
a5b4949
Merge pull request #73 from regro-cf-autotick-bot/2.0.0_h39af92
xhochy Mar 12, 2024
ae644b3
[ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration Conda…
conda-forge-curator[bot] Mar 15, 2024
6f2a997
Rebuild for snappy120
regro-cf-autotick-bot Apr 8, 2024
db6ca98
MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.34.1, and co…
regro-cf-autotick-bot Apr 8, 2024
8586762
Merge pull request #74 from regro-cf-autotick-bot/rebuild-snappy120-0…
nehaljwani Apr 8, 2024
0cfab48
[ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration Conda…
conda-forge-curator[bot] May 12, 2024
6913e03
updated v2.0.1
regro-cf-autotick-bot May 15, 2024
9d0d71c
MNT: Re-rendered with conda-build 24.5.0, conda-smithy 3.35.1, and co…
regro-cf-autotick-bot May 15, 2024
f6b9f11
Merge pull request #75 from regro-cf-autotick-bot/2.0.1_h68ffa5
h-vetinari May 15, 2024
abe8eeb
add runtime dependence on tzdata
h-vetinari May 27, 2024
60c5d03
Merge pull request #76 from h-vetinari/tzdb
xhochy May 27, 2024
5d215ac
update to 2.0.1
cbouss May 27, 2024
441ba22
s390x ld64 missing dso
cbouss May 27, 2024
0b3187d
vs2019 on windows
cbouss May 27, 2024
5df93ef
min osx 10.15
cbouss May 27, 2024
dcfc0c7
add libabseil for win, add run
cbouss May 27, 2024
17b21b6
cxx 17
cbouss May 28, 2024
bd0e747
address comments
cbouss May 30, 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
2 changes: 1 addition & 1 deletion recipe/bld.bat
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ cmake %CMAKE_ARGS% ^
-DBUILD_SHARED_LIBS=ON ^
-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON ^
-DBUILD_TOOLS=OFF ^
-DINSTALL_VENDORED_LIBS=OFF ^
-DORC_PREFER_STATIC_PROTOBUF=OFF ^
-DORC_PREFER_STATIC_SNAPPY=OFF ^
-DORC_PREFER_STATIC_LZ4=OFF ^
Expand All @@ -31,7 +32,6 @@ cmake %CMAKE_ARGS% ^
-DBUILD_JAVA=OFF ^
-DBUILD_LIBHDFSPP=OFF ^
-DBUILD_CPP_TESTS=OFF ^
-DBUILD_TOOLS=OFF ^
-GNinja ..
if errorlevel 1 exit /b 1
ninja -v
Expand Down
1 change: 1 addition & 0 deletions recipe/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ cmake ${CMAKE_ARGS} \
-DSNAPPY_HOME=$PREFIX \
-DBUILD_LIBHDFSPP=NO \
-DBUILD_CPP_TESTS=OFF \
-DINSTALL_VENDORED_LIBS=OFF \
-DCMAKE_INSTALL_PREFIX=$PREFIX \
-DCMAKE_C_COMPILER=$(type -p ${CC}) \
-DCMAKE_CXX_COMPILER=$(type -p ${CXX}) \
Expand Down
10 changes: 9 additions & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,20 @@ requirements:
- zlib {{ zlib }}
- snappy 1.1.10
- libprotobuf 4.25.3
- libabseil 20240116.2 # [win] linked with orc.dll through libprotobuf dep.
- lz4-c 1.9.4
- zstd {{ zstd }}
run:
# through run exports
- zlib
- snappy
- libprotobuf
- libabseil # [win]
- lz4-c
- zstd
- __osx >={{ MACOSX_DEPLOYMENT_TARGET }} # [osx and x86_64]

Choose a reason for hiding this comment

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

can this be done through macos_min_version?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

All our feedstock use MACOSX_DEPLOYMENT_TARGET to set this constraint.

Choose a reason for hiding this comment

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

yeah I see, it's a common pattern. out of interest, does macos_min_version do exactly the same thing do you know?

# orc >=2.0.1 will prefer $CONDA_PREFIX/share/zoneinfo for tzdb
- tzdata
- __osx >={{ MACOSX_DEPLOYMENT_TARGET }} # [osx and x86_64]

test:
commands:
Expand Down