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

[openssl3] Support tools feature #153

Merged
merged 2 commits into from
Jan 21, 2024
Merged

[openssl3] Support tools feature #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25b3002
[openssl3] support 'tools' feature
luncliff Jan 21, 2024
d425cfa
[openssl3] update baseline
luncliff Jan 21, 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
15 changes: 13 additions & 2 deletions ports/openssl3/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,13 @@ file(RENAME "${CURRENT_BUILDTREES_DIR}/${SOURCE_DIR_NAME}"
vcpkg_find_acquire_program(PERL)
get_filename_component(PERL_EXE_PATH "${PERL}" DIRECTORY)
vcpkg_add_to_path("${PERL_EXE_PATH}")
message(STATUS "Using perl: ${PERL}")

if(NOT VCPKG_HOST_IS_WINDOWS)
# see ${SOURCE_PATH}/NOTES-UNIX.md
find_program(MAKE make REQUIRED)
get_filename_component(MAKE_EXE_PATH "${MAKE}" DIRECTORY)
message(STATUS "Using make: ${MAKE}")
endif()

if(VCPKG_TARGET_IS_WINDOWS)
Expand All @@ -73,6 +75,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
vcpkg_add_to_path(PREPEND "${NASM_EXE_PATH}")
# note: jom is not for `vcpkg_add_to_path`
vcpkg_find_acquire_program(JOM)
message(STATUS "Using jom: ${JOM}")

elseif(VCPKG_TARGET_IS_ANDROID)
# see ${SOURCE_PATH}/NOTES-ANDROID.md
Expand Down Expand Up @@ -116,6 +119,10 @@ vcpkg_execute_required_process(
LOGNAME "configure-perl-${TARGET_TRIPLET}-rel"
)

if("tools" IN_LIST FEATURES)
list(APPEND TARGETS install_runtime)
endif()

if(VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_IS_WINDOWS)
message(STATUS "Building ${TARGET_TRIPLET}-dbg")
vcpkg_execute_required_process(
Expand All @@ -125,7 +132,7 @@ if(VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_IS_WINDOWS)
)
message(STATUS "Building ${TARGET_TRIPLET}-rel")
vcpkg_execute_required_process(
COMMAND ${JOM} /K /J ${VCPKG_CONCURRENCY} /F makefile install_dev
COMMAND ${JOM} /K /J ${VCPKG_CONCURRENCY} /F makefile install_dev ${TARGETS}
WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"
LOGNAME "install-${TARGET_TRIPLET}-rel"
)
Expand All @@ -140,7 +147,7 @@ else()
)
message(STATUS "Building ${TARGET_TRIPLET}-rel")
vcpkg_execute_required_process(
COMMAND ${MAKE} -j ${VCPKG_CONCURRENCY} install_dev
COMMAND ${MAKE} -j ${VCPKG_CONCURRENCY} install_dev ${TARGETS}
WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"
LOGNAME "install-${TARGET_TRIPLET}-rel"
)
Expand All @@ -166,6 +173,10 @@ else()

endif()

if("tools" IN_LIST FEATURES)
vcpkg_copy_tools(TOOL_NAMES openssl AUTO_CLEAN)
endif()

if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libcrypto.a"
"${CURRENT_PACKAGES_DIR}/debug/lib/libssl.a"
Expand Down
8 changes: 7 additions & 1 deletion ports/openssl3/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
{
"name": "openssl3",
"version-semver": "3.1.4",
"port-version": 1,
"description": "TLS/SSL and crypto library",
"homepage": "https://www.openssl.org/",
"license": "Apache-2.0"
"license": "Apache-2.0",
"features": {
"tools": {
"description": "Buind/Install OpenSSL CLI tools"
}
}
}
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
},
"openssl3": {
"baseline": "3.1.4",
"port-version": 0
"port-version": 1
},
"pthreadpool": {
"baseline": "2023-09-12",
Expand Down
5 changes: 5 additions & 0 deletions versions/o-/openssl3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "027b5866ebd1f8f5073660e4dd37f2b7c2961e41",
"version-semver": "3.1.4",
"port-version": 1
},
{
"git-tree": "4ccaa0ed4ddb704dc02138a5ea784a35b79b46ec",
"version-semver": "3.1.4",
Expand Down
Loading