Merge remote-tracking branch 'origin/master'

5 files changed, 189 insertions, 8 deletions

diff --git a/ports/openssl/CMakeLists.txt b/ports/openssl/CMakeLists.txt
new file mode 100644
index 000000000..a2d863452
--- /dev/null
+++ b/ports/openssl/CMakeLists.txt
@@ -0,0 +1,130 @@
+cmake_minimum_required(VERSION 3.9)

+project(openssl C)

+

+if(NOT SOURCE_PATH)

+    message(FATAL_ERROR "Requires SOURCE_PATH")

+endif()

+

+if(CMAKE_SYSTEM_NAME STREQUAL "Android")

+    set(PLATFORM android)

+elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")

+    if(CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64")

+        set(PLATFORM linux-generic64)

+    else()

+        set(PLATFORM linux-generic32)

+    endif()

+elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")

+    set(PLATFORM darwin64-x86_64-cc)

+elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")

+    set(PLATFORM BSD-generic64)

+else()

+    message(FATAL_ERROR "Unknown platform")

+endif()

+

+get_filename_component(COMPILER_ROOT "${CMAKE_C_COMPILER}" DIRECTORY)

+

+message("CMAKE_C_COMPILER=${CMAKE_C_COMPILER}")

+message("COMPILER_ROOT=${COMPILER_ROOT}")

+message("CMAKE_SYSROOT=${CMAKE_SYSROOT}")

+message("CMAKE_C_FLAGS=${CMAKE_C_FLAGS}")

+message("CMAKE_C_FLAGS_RELEASE=${CMAKE_C_FLAGS_RELEASE}")

+message("CMAKE_C_FLAGS_DEBUG=${CMAKE_C_FLAGS_DEBUG}")

+message("CMAKE_INCLUDE_SYSTEM_FLAG_C=${CMAKE_INCLUDE_SYSTEM_FLAG_C}")

+

+set(CFLAGS "${CMAKE_C_FLAGS}")

+if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")

+    set(CFLAGS "-Wno-error=unused-command-line-argument ${CMAKE_C_FLAGS}")

+endif()

+if(CMAKE_C_COMPILER_TARGET)

+    set(CFLAGS "${CFLAGS} ${CMAKE_C_COMPILE_OPTIONS_TARGET} ${CMAKE_C_COMPILER_TARGET}")

+endif()

+if(CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN)

+    set(CFLAGS "${CFLAGS} ${CMAKE_C_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN} ${CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN}")

+endif()

+if(CMAKE_SYSROOT AND CMAKE_C_COMPILE_OPTIONS_SYSROOT)

+    set(CFLAGS "${CFLAGS} ${CMAKE_C_COMPILE_OPTIONS_SYSROOT}${CMAKE_SYSROOT}")

+endif()

+

+file(TO_NATIVE_PATH ENV_PATH "${COMPILER_ROOT};$ENV{PATH}")

+set(ENV{ANDROID_DEV} "${CMAKE_SYSROOT}/usr")

+set(ENV{CC} "${CMAKE_C_COMPILER}")

+

+message("ENV{ANDROID_DEV}=$ENV{ANDROID_DEV}")

+

+get_filename_component(SOURCE_PATH_NAME "${SOURCE_PATH}" NAME)

+set(BUILDDIR "${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_PATH_NAME}")

+

+if(NOT EXISTS "${BUILDDIR}")

+    file(COPY ${SOURCE_PATH} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})

+endif()

+

+get_filename_component(MSYS_BIN_DIR "${MAKE}" DIRECTORY)

+

+

+file(READ "${BUILDDIR}/Configure" _contents)

+string(REPLACE "-mandroid" "" _contents "${_contents}")

+file(WRITE "${BUILDDIR}/Configure" "${_contents}")

+

+if(BUILD_SHARED_LIBS)

+    set(SHARED shared)

+else()

+    set(SHARED no-shared)

+endif()

+

+if(CMAKE_HOST_WIN32)

+    set(ENV_COMMAND set)

+    set(PATH_VAR ";%PATH%")

+else()

+    set(ENV_COMMAND export)

+    set(PATH_VAR ":$ENV{PATH}")

+endif()

+

+add_custom_command(

+    OUTPUT "${BUILDDIR}/Makefile"

+    COMMAND ${ENV_COMMAND} CC=${CMAKE_C_COMPILER}

+    COMMAND ${ENV_COMMAND} AR=${CMAKE_AR}

+    COMMAND ${ENV_COMMAND} LD=${CMAKE_LINKER}

+    COMMAND ${ENV_COMMAND} RANLIB=${CMAKE_RANLIB}

+    COMMAND ${ENV_COMMAND} MAKE=${MAKE}

+    COMMAND ${ENV_COMMAND} MAKEDEPPROG=${CMAKE_C_COMPILER}

+    COMMAND ${ENV_COMMAND} "PATH=${MSYS_BIN_DIR}${PATH_VAR}"

+    COMMAND "${PERL}" Configure

+        ${SHARED}

+        enable-static-engine

+        no-ssl2

+        no-krb5

+        no-idea

+        no-bf

+        no-cast

+        no-seed

+        no-md2

+        ${PLATFORM}

+        "--prefix=${CMAKE_INSTALL_PREFIX}"

+        "--openssldir=${CMAKE_INSTALL_PREFIX}"

+        ${CFLAGS}

+    COMMAND "${CMAKE_COMMAND}" "-DDIR=${BUILDDIR}" -P "${CMAKE_CURRENT_LIST_DIR}/remove-deps.cmake"

+    VERBATIM

+    WORKING_DIRECTORY "${BUILDDIR}"

+)

+

+add_custom_target(depend

+    COMMAND ${ENV_COMMAND} "PATH=${MSYS_BIN_DIR}${PATH_VAR}"

+    COMMAND "${MAKE}" links # depend MAKEDEPPROG=${CMAKE_C_COMPILER}

+    VERBATIM

+    WORKING_DIRECTORY "${BUILDDIR}"

+    DEPENDS "${BUILDDIR}/Makefile"

+)

+add_custom_target(build_libs ALL

+    COMMAND ${ENV_COMMAND} "PATH=${MSYS_BIN_DIR}${PATH_VAR}"

+    COMMAND "${CMAKE_COMMAND}" -E touch "${BUILDDIR}/krb5.h"

+    COMMAND "${MAKE}" build_libs

+    VERBATIM

+    WORKING_DIRECTORY "${BUILDDIR}"

+    DEPENDS depend

+    BYPRODUCTS "${BUILDDIR}/libssl.a" "${BUILDDIR}/libcrypto.a"

+)

+

+install(

+    FILES "${BUILDDIR}/libssl.a" "${BUILDDIR}/libcrypto.a"

+    DESTINATION lib

+)

diff --git a/ports/openssl/CONTROL b/ports/openssl/CONTROL
index e1cea2799..43a6eb660 100644
--- a/ports/openssl/CONTROL
+++ b/ports/openssl/CONTROL
@@ -1,3 +1,3 @@
 Source: openssl
-Version: 1.0.2n-2
+Version: 1.0.2n-3
 Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.
diff --git a/ports/openssl/portfile-nonwindows.cmake b/ports/openssl/portfile-nonwindows.cmake
new file mode 100644
index 000000000..3a4f69710
--- /dev/null
+++ b/ports/openssl/portfile-nonwindows.cmake
@@ -0,0 +1,33 @@
+if(CMAKE_HOST_WIN32)

+    vcpkg_acquire_msys(MSYS_ROOT PACKAGES make)

+    set(BASH ${MSYS_ROOT}/usr/bin/bash.exe)

+    set(MAKE ${MSYS_ROOT}/usr/bin/make.exe)

+else()

+    find_program(MAKE make)

+    if(NOT MAKE)

+        message(FATAL_ERROR "Could not find make. Please install it through your package manager.")

+    endif()

+endif()

+

+vcpkg_configure_cmake(

+    SOURCE_PATH ${CMAKE_CURRENT_LIST_DIR}

+    PREFER_NINJA

+    OPTIONS

+        -DSOURCE_PATH=${MASTER_COPY_SOURCE_PATH}

+        -DPERL=${PERL}

+        -DMAKE=${MAKE}

+    OPTIONS_RELEASE

+        -DINSTALL_HEADERS=ON

+)

+

+vcpkg_install_cmake()

+

+file(GLOB HEADERS ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*/include/openssl/*.h)

+set(RESOLVED_HEADERS)

+foreach(HEADER ${HEADERS})

+    get_filename_component(X "${HEADER}" REALPATH)

+    list(APPEND RESOLVED_HEADERS "${X}")

+endforeach()

+

+file(INSTALL ${RESOLVED_HEADERS} DESTINATION ${CURRENT_PACKAGES_DIR}/include/openssl)

+file(INSTALL ${MASTER_COPY_SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/openssl RENAME copyright)

diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake
index 65662dd86..023b3e233 100644
--- a/ports/openssl/portfile.cmake
+++ b/ports/openssl/portfile.cmake
@@ -8,13 +8,9 @@ set(OPENSSL_VERSION 1.0.2n)
 set(MASTER_COPY_SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openssl-${OPENSSL_VERSION})
 
 vcpkg_find_acquire_program(PERL)
-vcpkg_find_acquire_program(NASM)
-find_program(NMAKE nmake)
 
 get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY)
-get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY)
-vcpkg_find_acquire_program(JOM)
-set(ENV{PATH} "${NASM_EXE_PATH};$ENV{PATH};${PERL_EXE_PATH}")
+set(ENV{PATH} "$ENV{PATH};${PERL_EXE_PATH}")
 
 vcpkg_download_distfile(OPENSSL_SOURCE_ARCHIVE
     URLS "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz" "https://www.openssl.org/source/old/1.0.2/openssl-${OPENSSL_VERSION}.tar.gz"
@@ -31,6 +27,17 @@ vcpkg_apply_patches(
             ${CMAKE_CURRENT_LIST_DIR}/RemoveNonASCIIChar.patch
 )
 
+if(VCPKG_CMAKE_SYSTEM_NAME)
+    include(${CMAKE_CURRENT_LIST_DIR}/portfile-nonwindows.cmake)
+    return()
+endif()
+
+vcpkg_find_acquire_program(NASM)
+get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY)
+set(ENV{PATH} "${NASM_EXE_PATH};$ENV{PATH}")
+
+vcpkg_find_acquire_program(JOM)
+
 set(CONFIGURE_COMMAND ${PERL} Configure
     enable-static-engine
     enable-capieng
@@ -85,7 +92,7 @@ execute_process(
     ERROR_FILE ${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-rel-0-err.log
 )
 vcpkg_execute_required_process(
-    COMMAND ${NMAKE} -f ${OPENSSL_MAKEFILE} install
+    COMMAND ${JOM} -j 1 -f ${OPENSSL_MAKEFILE} install
     WORKING_DIRECTORY ${SOURCE_PATH_RELEASE}
     LOGNAME build-${TARGET_TRIPLET}-rel-1)
 
@@ -118,7 +125,7 @@ execute_process(
     ERROR_FILE ${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-dbg-0-err.log
 )
 vcpkg_execute_required_process(
-    COMMAND ${NMAKE} -f ${OPENSSL_MAKEFILE} install
+    COMMAND ${JOM} -j 1 -f ${OPENSSL_MAKEFILE} install
     WORKING_DIRECTORY ${SOURCE_PATH_DEBUG}
     LOGNAME build-${TARGET_TRIPLET}-dbg-1)
 
@@ -145,6 +152,10 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/)
 endif()
 
+file(READ "${CURRENT_PACKAGES_DIR}/include/openssl/dtls1.h" _contents)
+string(REPLACE "<winsock.h>" "<winsock2.h>" _contents "${_contents}")
+file(WRITE "${CURRENT_PACKAGES_DIR}/include/openssl/dtls1.h" "${_contents}")
+
 vcpkg_copy_pdbs()
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
diff --git a/ports/openssl/remove-deps.cmake b/ports/openssl/remove-deps.cmake
new file mode 100644
index 000000000..a57c70fe9
--- /dev/null
+++ b/ports/openssl/remove-deps.cmake
@@ -0,0 +1,7 @@
+file(GLOB_RECURSE MAKEFILES ${DIR}/*/Makefile)

+foreach(MAKEFILE ${MAKEFILES})

+    message("removing deps from ${MAKEFILE}")

+    file(READ "${MAKEFILE}" _contents)

+    string(REGEX REPLACE "\n# DO NOT DELETE THIS LINE.*" "" _contents "${_contents}")

+    file(WRITE "${MAKEFILE}" "${_contents}")

+endforeach()