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

orc 2.0.1 #11

merged 151 commits into from
May 30, 2024

Conversation

cbouss
Copy link
Contributor

@cbouss cbouss commented May 27, 2024

orc 2.0.1

Destination channel: main

Links

Explanation of changes:

automerged PR by conda-forge/automerge-action
regro-cf-autotick-bot and others added 22 commits March 6, 2024 14:49
…libprotobuf4253-0-1_h94d986

Rebuild for libprotobuf 4.25.3
add runtime dependence on tzdata
- 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?

Copy link
Contributor

@skupr-anaconda skupr-anaconda left a comment

Choose a reason for hiding this comment

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

LGTM

Comment on lines 1 to 4
cxx_compiler: # [win]
- 'vs2019' # [win]
c_compiler: # [win]
- 'vs2019' # [win]
Copy link
Contributor

Choose a reason for hiding this comment

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

This can be removed as vs2019 is already a default compiler in a generic cbc.yaml on win64

Copy link

@danpetry danpetry left a comment

Choose a reason for hiding this comment

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

Looks good, couple of minor nits

recipe/build.sh Outdated
@@ -16,9 +16,9 @@ if [[ ${HOST} =~ .*darwin.* ]]; then
_CMAKE_EXTRA_CONFIG+=(-DCMAKE_AR=${AR})
_CMAKE_EXTRA_CONFIG+=(-DCMAKE_RANLIB=${RANLIB})
_CMAKE_EXTRA_CONFIG+=(-DCMAKE_LINKER=${LD})
CXXFLAGS="${CXXFLAGS} -DPROTOBUF_USE_DLLS -D_LIBCPP_DISABLE_AVAILABILITY"

Choose a reason for hiding this comment

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

-DPROTOBUF_USE_DLLS sounds like a windows flag, not a macos one

fi
if [[ ${HOST} =~ .*linux.* ]]; then
CXXFLAGS="${CXXFLAGS//-std=c++17/-std=c++11}"
# I hate you so much CMake.
LIBPTHREAD=$(find ${PREFIX} -name "libpthread.so")
_CMAKE_EXTRA_CONFIG+=(-DPTHREAD_LIBRARY=${LIBPTHREAD})

Choose a reason for hiding this comment

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

export LDFLAGS="${LDFLAGS} -Wl,-rpath,$PREFIX/lib" instead of CPPFLAGS? (the current implementation seems to be working however)

@cbouss cbouss merged commit 8b7958b into master May 30, 2024
8 checks passed
@cbouss cbouss deleted the PKG-2719 branch May 30, 2024 21:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants