Hi On Mon, Jan 24, 2022 at 4:47 AM Lev Stipakov <lstipa...@gmail.com> wrote:
> From: Lev Stipakov <l...@openvpn.net> > > - add openssl3 port from > https://github.com/microsoft/vcpkg/pull/20428/files > with small changes: > > --- portfile.cmake.orig 2022-01-24 11:04:44.914467900 +0200 > +++ portfile.cmake 2022-01-24 11:02:46.066088800 +0200 > @@ -5,8 +5,8 @@ > vcpkg_from_github( > OUT_SOURCE_PATH SOURCE_PATH > REPO openssl/openssl > - REF openssl-3.0.0 > - SHA512 > > 50b4fefa3e5a3359e7b06bfbc4ecc525ef9d76e13d087aa8e2d29880f08f74cc9d0c76b9bf1895c118def2bb0e4db0095e799a752b64b60721a423bd2cf989da > + REF openssl-3.0.1 > + SHA512 > > 7f303769a3a796b88478399d42aa2a9a70dc74f62c975bbb93e8903e3bb8e25f16ecfc436186c2d4aa7383302c73ad1dd8ac4fccaa589062bbce6059d6073f18 > ) > > if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") > @@ -114,13 +114,13 @@ > if(VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_IS_WINDOWS) > message(STATUS "Building ${TARGET_TRIPLET}-dbg") > vcpkg_execute_required_process( > - COMMAND ${JOM} /K /J ${VCPKG_CONCURRENCY} /F makefile > install_dev > + COMMAND ${JOM} /K /J ${VCPKG_CONCURRENCY} /F makefile > install_dev install_runtime > WORKING_DIRECTORY > "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" > LOGNAME install-${TARGET_TRIPLET}-dbg > ) > 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 install_runtime > WORKING_DIRECTORY > "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" > LOGNAME install-${TARGET_TRIPLET}-rel > ) > @@ -129,13 +129,13 @@ > else() > message(STATUS "Building ${TARGET_TRIPLET}-dbg") > vcpkg_execute_required_process( > - COMMAND ${MAKE} -j ${VCPKG_CONCURRENCY} install_dev > + COMMAND ${MAKE} -j ${VCPKG_CONCURRENCY} install_dev > install_runtime > WORKING_DIRECTORY > "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" > LOGNAME install-${TARGET_TRIPLET}-dbg > ) > message(STATUS "Building ${TARGET_TRIPLET}-rel") > vcpkg_execute_required_process( > - COMMAND ${MAKE} -j ${VCPKG_CONCURRENCY} install_dev > + COMMAND ${MAKE} -j ${VCPKG_CONCURRENCY} install_dev > install_runtime > WORKING_DIRECTORY > "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" > LOGNAME install-${TARGET_TRIPLET}-rel > ) > @@ -161,6 +161,17 @@ > > endif() > > +if(VCPKG_TARGET_IS_WINDOWS) > + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/openssl/") > + file(RENAME "${CURRENT_PACKAGES_DIR}/bin/openssl.exe" > "${CURRENT_PACKAGES_DIR}/tools/openssl/openssl.exe") > + > + file(REMOVE > + "${CURRENT_PACKAGES_DIR}/debug/bin/openssl.exe" > + ) > +endif() > + > +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/openssl") > + > if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") > file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libcrypto.a" > "${CURRENT_PACKAGES_DIR}/debug/lib/libssl.a" > @@ -184,4 +195,4 @@ > ) > file(INSTALL "${CURRENT_PORT_DIR}/usage" > DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" > -) > \ No newline at end of file > +) > A whole patch in the commit message is not very helpful and makes it hard to read. Why not include this patch + the original, and apply the patch during build? Or just add a pointer to the original file in the changed file so that it could be diff-ed against if need be, > - use sizeof(void *) since msvc doesn't support sizeof of function ptr > - use XKEY_PROV_PROPS macro instead of props since msvc > requires constant expression in aggregate initializers > These changes look sane though I think this should be a separate commit. Selva
_______________________________________________ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
