[openssl] Update to 1.1.1i #15298

lebdron · 2020-12-25T15:48:06Z

Update openssl to 1.1.1i.
Add support for arm64-osx triplet.

NancyLi1013 · 2020-12-28T07:18:38Z

ports/openssl/unix/CMakeLists.txt

@@ -25,7 +25,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "iOS")
    # disable that makes linkage error (e.g. require stderr usage)
    list(APPEND DISABLES no-stdio no-ui no-asm)
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-    set(PLATFORM darwin64-x86_64-cc)
+    set(PLATFORM darwin64-${CMAKE_OSX_ARCHITECTURES}-cc)


@Neumann-A Could you please help review?

https://cmake.org/cmake/help/v3.19/variable/CMAKE_OSX_ARCHITECTURES.html

seems ok from the description but I am not an osx guy so I don't know which values CMAKE_OSX_ARCHITECTURES actually has

Thanks for your help @Neumann-A.

If I recall correctly CMAKE_OSX_ARCHITECTURES can contain multiple values, e.g: x86_64;arm64 when building universal (a.k.a. fat) binaries. But to be fair, we don't handle those properly in vcpkg (see lines 166-196 in our toolchain).

I'd prefer if we used old-and-trusty if-else instead of trying to do something clever.

NancyLi1013 · 2020-12-28T07:24:52Z

Hi @lebdron

Thanks for this PR.

Could you please look into the failures?

cppcms failed on x86-windows and x64-windows

[302/431] cmd.exe /C "cd /D D:\buildtrees\cppcms\x86-windows-dbg && D:\installed\x86-windows\tools\python3\python.exe D:/buildtrees/cppcms/src/20a4ad93d4-26c9d29282.clean/bin/cppcms_tmpl_cc -o D:/buildtrees/cppcms/x86-windows-dbg/tc_skin.cpp D:/buildtrees/cppcms/src/20a4ad93d4-26c9d29282.clean/tests/tc_skin.tmpl"
FAILED: tc_skin.cpp 
cmd.exe /C "cd /D D:\buildtrees\cppcms\x86-windows-dbg && D:\installed\x86-windows\tools\python3\python.exe D:/buildtrees/cppcms/src/20a4ad93d4-26c9d29282.clean/bin/cppcms_tmpl_cc -o D:/buildtrees/cppcms/x86-windows-dbg/tc_skin.cpp D:/buildtrees/cppcms/src/20a4ad93d4-26c9d29282.clean/tests/tc_skin.tmpl"
Traceback (most recent call last):
  File "D:\buildtrees\cppcms\src\20a4ad93d4-26c9d29282.clean\bin\cppcms_tmpl_cc", line 14, in <module>
    import StringIO
ModuleNotFoundError: No module named 'StringIO'

open62541 failed on x64-windows-static:

FAILED: src_generated/open62541/transport_generated.c src_generated/open62541/transport_generated.h src_generated/open62541/transport_generated_handling.h src_generated/open62541/transport_generated_encoding_binary.h 
cmd.exe /C "cd /D D:\buildtrees\open62541\x64-windows-static-dbg && D:\installed\x64-windows-static\tools\python3\python.exe D:/buildtrees/open62541/src/26be47a0cb-7b2df1ce14.clean/tools/generate_datatypes.py --namespace=1 --selected-types=D:/buildtrees/open62541/src/26be47a0cb-7b2df1ce14.clean/tools/schema/datatypes_transport.txt --type-bsd=D:/buildtrees/open62541/src/26be47a0cb-7b2df1ce14.clean/tools/schema/Opc.Ua.Types.bsd --type-bsd=D:/buildtrees/open62541/src/26be47a0cb-7b2df1ce14.clean/tools/schema/Custom.Opc.Ua.Transport.bsd --type-csv=D:/buildtrees/open62541/src/26be47a0cb-7b2df1ce14.clean/tools/schema/NodeIds.csv --no-builtin --internal D:/buildtrees/open62541/x64-windows-static-dbg/src_generated/open62541/transport"
Traceback (most recent call last):
  File "D:\installed\x64-windows-static\tools\python3\lib\xml\etree\ElementTree.py", line 1527, in __init__
    from xml.parsers import expat
  File "D:\installed\x64-windows-static\tools\python3\lib\xml\parsers\expat.py", line 4, in <module>
    from pyexpat import *
ModuleNotFoundError: No module named 'pyexpat'

lebdron · 2020-12-28T07:27:54Z

Hello @NancyLi1013

Could you rerun the pipelines please? Those issues do not really look related to OpenSSL. Thanks!

NancyLi1013 · 2020-12-28T09:04:13Z

@lebdron

I noticed you have submit a new commit to retrigger CI.

Since cppcms and open62541 have the dependency of openssl. It might be something related with the changes in this PR.

Let's see the latest build results.

Hoikas · 2020-12-31T22:45:56Z

The CI failures seem to be related to the wrong Python executable being used - I've submitted a fix in #15404.

lebdron · 2021-01-06T11:10:12Z

Requires #15473 now. With poppler, the problem appears when curl is installed with vcpkg.

lebdron · 2021-01-06T11:30:58Z

@Neumann-A could you check the change mentioned please? and also poppler build fails because of this policy issue https://github.com/microsoft/vcpkg/pull/10715/files#r404183663 . Could you tell what is the suggested fix?

NancyLi1013 · 2021-01-07T07:44:25Z

@lebdron

Could you please merge master to this branch to retrigger CI? Since some problems caused by python3 has been solved now.

lebdron · 2021-01-07T09:57:59Z

@NancyLi1013 Done! CI passed 😌

NancyLi1013 · 2021-01-08T02:01:55Z

LGTM now except for CMAKE_OSX_ARCHITECTURES. Since I'm not familiar with this.

Thanks for your PR @lebdron.

@vicroms

Could you please help review this point? Please help confirm if CMAKE_OSX_ARCHITECTURES is proper here.

Thanks.

vicroms · 2021-01-08T19:56:47Z

ports/openssl/unix/CMakeLists.txt

@@ -25,7 +25,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "iOS")
    # disable that makes linkage error (e.g. require stderr usage)
    list(APPEND DISABLES no-stdio no-ui no-asm)
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-    set(PLATFORM darwin64-x86_64-cc)
+    set(PLATFORM darwin64-${CMAKE_OSX_ARCHITECTURES}-cc)


If I recall correctly CMAKE_OSX_ARCHITECTURES can contain multiple values, e.g: x86_64;arm64 when building universal (a.k.a. fat) binaries. But to be fair, we don't handle those properly in vcpkg (see lines 166-196 in our toolchain).

I'd prefer if we used old-and-trusty if-else instead of trying to do something clever.

Signed-off-by: Andrei Lebedev <lebdron@gmail.com>

vicroms · 2021-01-08T20:10:10Z

Thanks for the PR!
Waiting for CI results to merge.

vicroms · 2021-01-11T07:47:53Z

/azp run

azure-pipelines · 2021-01-11T07:48:05Z

Azure Pipelines successfully started running 1 pipeline(s).

vicroms · 2021-01-11T08:08:13Z

Thanks for the PR!

lebdron force-pushed the openssl-1.1.1i branch from eb37d86 to 0488772 Compare December 25, 2020 16:29

JackBoosY assigned NancyLi1013 Dec 28, 2020

JackBoosY added the category:port-update The issue is with a library, which is requesting update new revision label Dec 28, 2020

NancyLi1013 added the category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist label Dec 28, 2020

NancyLi1013 reviewed Dec 28, 2020

View reviewed changes

NancyLi1013 added the requires:author-response label Dec 28, 2020

lebdron force-pushed the openssl-1.1.1i branch from 0488772 to 46f8ab6 Compare December 28, 2020 08:04

Hoikas mentioned this pull request Dec 31, 2020

[many ports] Disambiguate Python usage. #15404

Closed

Hoikas mentioned this pull request Jan 5, 2021

[python3] Add vcpkg-cmake-wrapper. #15221

Merged

lebdron force-pushed the openssl-1.1.1i branch from 46f8ab6 to 705ee5c Compare January 5, 2021 23:09

lebdron requested a review from NancyLi1013 January 7, 2021 09:58

NancyLi1013 approved these changes Jan 8, 2021

View reviewed changes

NancyLi1013 removed the requires:author-response label Jan 8, 2021

NancyLi1013 added requires:discussion info:reviewed Pull Request changes follow basic guidelines labels Jan 8, 2021

vicroms added requires:author-response and removed requires:discussion labels Jan 8, 2021

vicroms requested changes Jan 8, 2021

View reviewed changes

vicroms removed the info:reviewed Pull Request changes follow basic guidelines label Jan 8, 2021

[openssl] Update to 1.1.1i

ff4561f

Signed-off-by: Andrei Lebedev <lebdron@gmail.com>

lebdron force-pushed the openssl-1.1.1i branch from 9e0c2ad to ff4561f Compare January 8, 2021 20:05

lebdron requested a review from vicroms January 8, 2021 20:06

vicroms approved these changes Jan 8, 2021

View reviewed changes

vicroms added info:reviewed Pull Request changes follow basic guidelines and removed requires:author-response labels Jan 8, 2021

Hoikas mentioned this pull request Jan 10, 2021

Updating OpenSSL to 1.1.1i and supporting M1 Mac native arm generation #15561

Closed

vicroms merged commit 1329385 into microsoft:master Jan 11, 2021

lebdron deleted the openssl-1.1.1i branch January 11, 2021 09:12

lebdron mentioned this pull request Jan 11, 2021

[openssl] port is hard-coded to compile to x86_64, doesn't support arm64 for Apple M1 chip macs #15560

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[openssl] Update to 1.1.1i #15298

[openssl] Update to 1.1.1i #15298

lebdron commented Dec 25, 2020

NancyLi1013 Dec 28, 2020

Neumann-A Jan 6, 2021

NancyLi1013 Jan 7, 2021

vicroms Jan 8, 2021

NancyLi1013 commented Dec 28, 2020

lebdron commented Dec 28, 2020

NancyLi1013 commented Dec 28, 2020

Hoikas commented Dec 31, 2020

lebdron commented Jan 6, 2021

lebdron commented Jan 6, 2021

NancyLi1013 commented Jan 7, 2021

lebdron commented Jan 7, 2021

NancyLi1013 commented Jan 8, 2021

vicroms Jan 8, 2021

vicroms commented Jan 8, 2021

vicroms commented Jan 11, 2021

azure-pipelines bot commented Jan 11, 2021

vicroms commented Jan 11, 2021

[openssl] Update to 1.1.1i #15298

[openssl] Update to 1.1.1i #15298

Conversation

lebdron commented Dec 25, 2020

NancyLi1013 Dec 28, 2020

Choose a reason for hiding this comment

Neumann-A Jan 6, 2021

Choose a reason for hiding this comment

NancyLi1013 Jan 7, 2021

Choose a reason for hiding this comment

vicroms Jan 8, 2021

Choose a reason for hiding this comment

NancyLi1013 commented Dec 28, 2020

lebdron commented Dec 28, 2020

NancyLi1013 commented Dec 28, 2020

Hoikas commented Dec 31, 2020

lebdron commented Jan 6, 2021

lebdron commented Jan 6, 2021

NancyLi1013 commented Jan 7, 2021

lebdron commented Jan 7, 2021

NancyLi1013 commented Jan 8, 2021

vicroms Jan 8, 2021

Choose a reason for hiding this comment

vicroms commented Jan 8, 2021

vicroms commented Jan 11, 2021

azure-pipelines bot commented Jan 11, 2021

vicroms commented Jan 11, 2021