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

ORC-1810: [C++] Add environment variable ORC_FORMAT_URL #2094

Closed
wants to merge 3 commits into from
Closed

ORC-1810: [C++] Add environment variable ORC_FORMAT_URL #2094

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
250910a
ORC-1810:[C++] Add cmake option ORC_FORMAT_URL
luffy-zh Dec 23, 2024
9260575
replace cmake option with env variable
luffy-zh Dec 26, 2024
635c8a2
revert needless change
luffy-zh Jan 3, 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
6 changes: 4 additions & 2 deletions cmake_modules/ThirdpartyToolchain.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ option(ORC_PREFER_STATIC_LZ4 "Prefer static lz4 library, if available"
option(ORC_PREFER_STATIC_ZSTD "Prefer static zstd library, if available" ON)
option(ORC_PREFER_STATIC_ZLIB "Prefer static zlib library, if available" ON)
option(ORC_PREFER_STATIC_GMOCK "Prefer static gmock library, if available" ON)

Copy link
Member

Choose a reason for hiding this comment

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

We may want to revert this needless change.

set(DEFAULT_ORC_FORMAT_URL "https://www.apache.org/dyn/closer.lua/orc/orc-format-${ORC_FORMAT_VERSION}/orc-format-${ORC_FORMAT_VERSION}.tar.gz?action=download")
Copy link
Member

Choose a reason for hiding this comment

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

What about moving it to below line 139?

set(ORC_FORMAT_URL ${DEFAULT_ORC_FORMAT_URL} CACHE STRING "URL from which to download ORC format library" FORCE)
Copy link
Member

Choose a reason for hiding this comment

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

What about using environment variable?

if(DEFINED ENV{ORC_FORMAT_URL})
  set(ORC_FORMAT_SOURCE_URL "$ENV{ORC_FORMAT_URL}")
else()
  set(ORC_FORMAT_SOURCE_URL
    "https://www.apache.org/dyn/closer.lua/orc/orc-format-${ORC_FORMAT_VERSION}/orc-format-${ORC_FORMAT_VERSION}.tar.gz?action=download"
  )
endif()

# zstd requires us to add the threads
FIND_PACKAGE(Threads REQUIRED)

Expand Down Expand Up @@ -136,8 +137,9 @@ endfunction()

# ----------------------------------------------------------------------
# ORC Format
message(STATUS "Using ORC_FORMAT_URL: ${ORC_FORMAT_URL}")
ExternalProject_Add (orc-format_ep
URL "https://www.apache.org/dyn/closer.lua/orc/orc-format-${ORC_FORMAT_VERSION}/orc-format-${ORC_FORMAT_VERSION}.tar.gz?action=download"
URL ${ORC_FORMAT_URL}
URL_HASH SHA256=739fae5ff94b1f812b413077280361045bf92e510ef04b34a610e23a945d8cd5
Copy link
Member

Choose a reason for hiding this comment

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

User provided URL may not match the URL_HASH below. We should probably avoid passing URL_HASH to ExternalProject_Add

CONFIGURE_COMMAND ""
BUILD_COMMAND ""
Expand Down
Loading