diff options
| author | Victor Romero <viromer@microsoft.com> | 2019-01-10 17:05:54 -0800 |
|---|---|---|
| committer | Victor Romero <viromer@microsoft.com> | 2019-01-10 17:05:54 -0800 |
| commit | 0e08805a7b60e9c74cf1232cc28652d8761c88dc (patch) | |
| tree | 33f9b532f550b0c21ddd7dd22092c3d601bbf96d | |
| parent | f9732c27f1bf9aa127ed9b53d4bb20612a6fd0af (diff) | |
| download | vcpkg-0e08805a7b60e9c74cf1232cc28652d8761c88dc.tar.gz vcpkg-0e08805a7b60e9c74cf1232cc28652d8761c88dc.zip | |
[openssl-uwp] Patch Configure script to set UNICODE
| -rw-r--r-- | ports/openssl-uwp/fix-uwp-configure-unicode.patch | 19 | ||||
| -rw-r--r-- | ports/openssl-uwp/portfile.cmake | 12 |
2 files changed, 25 insertions, 6 deletions
diff --git a/ports/openssl-uwp/fix-uwp-configure-unicode.patch b/ports/openssl-uwp/fix-uwp-configure-unicode.patch new file mode 100644 index 000000000..a3b645ad1 --- /dev/null +++ b/ports/openssl-uwp/fix-uwp-configure-unicode.patch @@ -0,0 +1,19 @@ +diff --git a/Configure b/Configure +index 67df080..57a15d8 100644 +--- a/Configure ++++ b/Configure +@@ -598,12 +598,12 @@ my %table=( + # 'perl Configure VC-WINSTORE + "VC-WINSTORE","cl:-W3 -WX -Gs0 -GF -Gy -nologo -DWIN32_LEAN_AND_MEAN -DWINAPI_FAMILY=WINAPI_FAMILY_PC_APP -DOPENSSL_WINAPP -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -FIsdkddkver.h -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32", + # 'perf Configure VC-WINUNIVERSAL +-"VC-WINUNIVERSAL","cl:-W3 -WX -Gs0 -GF -Gy -nologo -DWIN32_LEAN_AND_MEAN -DWINAPI_FAMILY=WINAPI_FAMILY_APP -DOPENSSL_WINAPP -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -FIsdkddkver.h -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32", ++"VC-WINUNIVERSAL","cl:-W3 -WX -Gs0 -GF -Gy -nologo -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE -DWINAPI_FAMILY=WINAPI_FAMILY_APP -DOPENSSL_WINAPP -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -FIsdkddkver.h -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32", + + "debug-VC-WIN32","cl:-W3 -WX -Gs0 -GF -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32", + "debug-VC-WINPHONE","cl:-W3 -WX -Gs0 -GF -Gy -Zi -nologo -DWIN32_LEAN_AND_MEAN -DWINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DOPENSSL_WINAPP -FIsdkddkver.h -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32", + "debug-VC-WINSTORE","cl:-W3 -WX -Gs0 -GF -Gy -Zi -nologo -DWIN32_LEAN_AND_MEAN -DWINAPI_FAMILY=WINAPI_FAMILY_PC_APP -DOPENSSL_WINAPP -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -FIsdkddkver.h -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32", +-"debug-VC-WINUNIVERSAL","cl:-W3 -WX -Gs0 -GF -Gy -Zi -nologo -DWIN32_LEAN_AND_MEAN -DWINAPI_FAMILY=WINAPI_FAMILY_APP -DOPENSSL_WINAPP -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DOPENSSL_WINUCRT -FIsdkddkver.h -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32", ++"debug-VC-WINUNIVERSAL","cl:-W3 -WX -Gs0 -GF -Gy -Zi -nologo -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE -DWINAPI_FAMILY=WINAPI_FAMILY_APP -DOPENSSL_WINAPP -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DOPENSSL_WINUCRT -FIsdkddkver.h -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32", + + # Unified CE target + "VC-CE","cl::::WINCE::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${no_asm}:win32", diff --git a/ports/openssl-uwp/portfile.cmake b/ports/openssl-uwp/portfile.cmake index 77264b3ec..83eff7dcc 100644 --- a/ports/openssl-uwp/portfile.cmake +++ b/ports/openssl-uwp/portfile.cmake @@ -19,7 +19,6 @@ endif() include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openssl-OpenSSL_1_0_2q_WinRT) vcpkg_find_acquire_program(PERL) vcpkg_find_acquire_program(JOM) @@ -33,11 +32,12 @@ vcpkg_download_distfile(ARCHIVE SHA512 828ddeb10b7d04155df64cb38f3d8b8109ff01494fed7f6c1063673e45414c1c309379e8bbe72478bd0fbae649d6749877c20b1b4a91db136a0853745f4da6b6 ) -vcpkg_extract_source_archive(${ARCHIVE}) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix-uwp-rs4.patch +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES + ${CMAKE_CURRENT_LIST_DIR}/fix-uwp-rs4.patch + ${CMAKE_CURRENT_LIST_DIR}/fix-uwp-configure-unicode.patch ) file(REMOVE_RECURSE ${SOURCE_PATH}/tmp32dll) |