Skip to content

Commit 56560b6

Browse files
authored
Add missing -devel deps for 6.x (#7345)
1 parent 3fdc60f commit 56560b6

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
1414
- Improved logging of snapshot digests (#7300)
1515
- Node will now retry when fetching snapshots. This is controlled with `command.join.fetch_snapshot_max_attempts` and `command.join.fetch_snapshot_retry_interval`. (#7317)
1616
- Remove pyopenssl (#7297)
17+
- Fix missing -devel package dependencies (#7345)
1718

1819
### Changed
1920

cmake/cpack_settings.cmake

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,15 @@ message(STATUS "RPM package version: ${CPACK_RPM_PACKAGE_VERSION}")
2323

2424
set(OPENSSL_MINIMAL_VERSION "3.3.0")
2525
set(NGHTTP2_MINIMAL_VERSION "1.40.0")
26+
set(LIBUV_MINIMAL_VERSION "1.34.2")
27+
set(LIBCURL_MINIMAL_VERSION "7.68.0")
2628

2729
set(CPACK_RPM_PACKAGE_LICENSE "Apache-2.0")
2830
set(CPACK_RPM_PACKAGE_DESCRIPTION "${PROJECT_DESCRIPTION}")
2931

3032
if(CCF_DEVEL)
3133
set(CCF_RPM_BASE_DEPENDENCIES
32-
"openssl-devel >= ${OPENSSL_MINIMAL_VERSION}, nghttp2-devel >= ${NGHTTP2_MINIMAL_VERSION}"
34+
"openssl-devel >= ${OPENSSL_MINIMAL_VERSION}, nghttp2-devel >= ${NGHTTP2_MINIMAL_VERSION}, libuv-devel >= ${LIBUV_MINIMAL_VERSION}, curl-devel >= {LIBCURL_MINIMAL_VERSION}"
3335
)
3436
# + build toolchain
3537
set(CCF_RPM_BASE_DEPENDENCIES
@@ -43,13 +45,11 @@ if(CCF_DEVEL)
4345
)
4446
else()
4547
set(CCF_RPM_BASE_DEPENDENCIES
46-
"openssl >= ${OPENSSL_MINIMAL_VERSION}, nghttp2 >= ${NGHTTP2_MINIMAL_VERSION}"
48+
"openssl >= ${OPENSSL_MINIMAL_VERSION}, nghttp2 >= ${NGHTTP2_MINIMAL_VERSION} libuv >= ${LIBUV_MINIMAL_VERSION}, curl >= {LIBCURL_MINIMAL_VERSION}"
4749
)
4850
endif()
4951

50-
set(CCF_RPM_DEPENDENCIES
51-
"${CCF_RPM_BASE_DEPENDENCIES}, libuv >= 1.34.2, curl >= 7.68.0, libcxxabi >= 18.1.2"
52-
)
52+
set(CCF_RPM_DEPENDENCIES "${CCF_RPM_BASE_DEPENDENCIES}, libcxxabi >= 18.1.2")
5353

5454
message(STATUS "RPM package dependencies: ${CCF_RPM_DEPENDENCIES}")
5555

0 commit comments

Comments
 (0)