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

Eliminate RECENT_PKGS option #49

Merged
merged 3 commits into from
Nov 30, 2023
+54 −62
Merged

Eliminate RECENT_PKGS option #49

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
2c85cb4
Eliminate RECENT_PKGS option
ffoulkes Nov 14, 2023
bf6f8d9
Remove custom build scripts
ffoulkes Nov 20, 2023
9c125ff
Edit a couple of comments for clarity
ffoulkes Nov 27, 2023
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: 0 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ option(GIT_PROGRESS "Show Git progress" TRUE)
option(ON_DEMAND "Build targets on demand" FALSE)
option(OVERRIDE_PKGS "Use own versions of subpackages" TRUE)
option(PATCH "Patch source after downloading" TRUE)
option(RECENT_PKGS "Use newer versions of packages" FALSE)
option(USE_LDCONFIG "Use ldconfig when installing" FALSE)

# Note: USE_SUDO should be DISABLED by default.
Expand Down
72 changes: 34 additions & 38 deletions cmake/deps.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,42 +3,38 @@
# Copyright 2022-2023 Intel Corporation
# SPDX-License-Identifier: Apache-2.0
#
# Generated by components.py.
#

set(ABSEIL_GIT_URL "https://github.com/abseil/abseil-cpp.git")
set(ABSEIL_GIT_TAG "29bf8085f3bf17b84d30e34b3d7ff8248fda404e") # 20230802.0

set(CARES_GIT_URL "https://github.com/c-ares/c-ares.git")
set(CARES_GIT_TAG "6360e96b5cf8e5980c887ce58ef727e53d77243a") # v1.19.1

set(CCTZ_GIT_URL "https://github.com/google/cctz.git")
set(CCTZ_GIT_TAG "02918d62329ef440935862719829d061a5f4beba") # master~25

set(GFLAGS_GIT_URL "https://github.com/gflags/gflags.git")
set(GFLAGS_GIT_TAG "827c769e5fc98e0f2a34c47cef953cc6328abced") # master~5

set(GLOG_GIT_URL "https://github.com/google/glog.git")
set(GLOG_GIT_TAG "a8e0007e96ff96145022c488e367da10f835c75d") # v0.6.0-rc1

set(GRPC_GIT_URL "https://github.com/google/grpc.git")
set(GRPC_GIT_TAG "883e5f76976b86afee87415dc67bde58d9b295a4") # v1.59.2
set(GRPC_VERSION "1.59.2")

set(GTEST_GIT_URL "https://github.com/google/googletest.git")
set(GTEST_GIT_TAG "e2239ee6043f73722e7aa812a459f54a28552929") # v1.11.0

set(JSON_GIT_URL "https://github.com/nlohmann/json.git")
set(JSON_GIT_TAG "760304635dc74a5bf77903ad92446a6febb85acf") # tags/v3.10.5^2~8

set(PROTOBUF_GIT_URL "https://github.com/google/protobuf.git")
set(PROTOBUF_GIT_TAG "6b5d8db01fe47478e8d400f550e797e6230d464e") # v25.0
set(PROTOBUF_VERSION "25.0")
set(PROTOBUF_ABSL_PROVIDER "package")

set(ABSEIL_GIT_URL https://github.com/abseil/abseil-cpp.git)
set(CARES_GIT_URL https://github.com/c-ares/c-ares.git)
set(GRPC_GIT_URL https://github.com/google/grpc.git)
set(PROTOBUF_GIT_URL https://github.com/google/protobuf.git)
set(ZLIB_GIT_URL https://github.com/madler/zlib)

if(RECENT_PKGS)
set(ABSEIL_GIT_TAG 29bf8085f3bf17b84d30e34b3d7ff8248fda404e) # 20230802.0
set(CARES_GIT_TAG 6360e96b5cf8e5980c887ce58ef727e53d77243a) # v1.19.1
set(GRPC_GIT_TAG 0df9accc5c3478d126742fb84dd7155786dc4f68) # v1.59.1
set(GRPC_VERSION 1.59.1)
set(PROTOBUF_GIT_TAG b2b7a51158418f41cff0520894836c15b1738721) # v24.3
set(ZLIB_GIT_TAG 04f42ceca40f73e2978b50e93806c2a18c1281fc) # v1.2.13
else()
set(ABSEIL_GIT_TAG 29bf8085f3bf17b84d30e34b3d7ff8248fda404e) # 20230802.0
set(CARES_GIT_TAG 6360e96b5cf8e5980c887ce58ef727e53d77243a) # v1.19.1
if(NOT DEFINED GRPC_GIT_TAG)
set(GRPC_GIT_TAG 883e5f76976b86afee87415dc67bde58d9b295a4) # v1.59.2
set(GRPC_VERSION 1.59.2)
endif()
set(PROTOBUF_GIT_TAG 6b5d8db01fe47478e8d400f550e797e6230d464e) # v25.0
set(ZLIB_GIT_TAG 09155eaa2f9270dc4ed1fa13e2b4b2613e6e4851) # v1.3
endif()

set(CCTZ_GIT_URL https://github.com/google/cctz.git)
set(CCTZ_GIT_TAG 02918d62329ef440935862719829d061a5f4beba) # master~25

set(GFLAGS_GIT_URL https://github.com/gflags/gflags.git)
set(GFLAGS_GIT_TAG 827c769e5fc98e0f2a34c47cef953cc6328abced) # master~5

set(GLOG_GIT_URL https://github.com/google/glog.git)
set(GLOG_GIT_TAG a8e0007e96ff96145022c488e367da10f835c75d) # v0.6.0-rc1

set(GTEST_GIT_URL https://github.com/google/googletest.git)
set(GTEST_GIT_TAG e2239ee6043f73722e7aa812a459f54a28552929) # v1.11.0

set(JSON_GIT_URL https://github.com/nlohmann/json.git)
set(JSON_GIT_TAG 760304635dc74a5bf77903ad92446a6febb85acf) # tags/v3.10.5^2~8
set(ZLIB_GIT_URL "https://github.com/madler/zlib")
set(ZLIB_GIT_TAG "09155eaa2f9270dc4ed1fa13e2b4b2613e6e4851") # v1.3
22 changes: 16 additions & 6 deletions cmake/protobuf.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,28 @@ unset(_absl_provider)
unset(_build_shared_libs)
unset(_source_subdir)

# In older versions of protobuf, the primary CMakeLists.txt file
# is in the cmake subdirectory.
# Enabled by "defines": { "SOURCE_SUBDIR": "cmake" }
if(DEFINED PROTOBUF_SOURCE_SUBDIR)
set(_source_subdir SOURCE_SUBDIR ${PROTOBUF_SOURCE_SUBDIR})
endif()

# Protobuf v23.x generates unresolved external references to
# ThreadSafeArena::ThreadCache _thread_cache if BUILD_SHARED_LIBS=ON.
if(RECENT_PKGS)
set(_build_shared_libs off)
# Enabled by "defines": { "BUILD_SHARED_LIBS": "OFF" }
if(DEFINED PROTOBUF_BUILD_SHARED_LIBS)
set(_build_shared_libs ${PROTOBUF_BUILD_SHARED_LIBS})
else()
set(_build_shared_libs on)
set(_build_shared_libs ON)
endif()

# Protobuf v23.x bundles its own copy of Abseil.
# We suppress it in favor of our own version or the
# version bundles with gRPC.
set(_absl_provider -Dprotobuf_ABSL_PROVIDER=package)
# We suppress it in favor of our own version or the version bundled with gRPC.
# Enabled by "defines": { "ABSL_PROVIDER": "package" }
if(DEFINED PROTOBUF_ABSL_PROVIDER)
set(_absl_provider -Dprotobuf_ABSL_PROVIDER=${PROTOBUF_ABSL_PROVIDER})
endif()

GetDownloadClause(_download_clause ${PROTOBUF_GIT_URL} ${PROTOBUF_GIT_TAG})

Expand Down
5 changes: 4 additions & 1 deletion components.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,10 @@
"url": "https://github.com/google/protobuf.git",
"sha": "6b5d8db01fe47478e8d400f550e797e6230d464e",
"tag": "v25.0",
"version": "25.0"
"version": "25.0",
"defines": {
"ABSL_PROVIDER": "package"
}
},
"zlib": {
"name": "zlib",
Expand Down
9 changes: 0 additions & 9 deletions scripts/custom-grpc.sh
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions scripts/recent-grpc.sh
View file
Open in desktop

This file was deleted.