diff options
| author | Jon Spencer <jon@jonspencer.ca> | 2019-06-08 18:35:37 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2019-06-08 18:35:37 -0700 |
| commit | e2d5324c5792845520085c4289d63f6d9a7c45ff (patch) | |
| tree | e5a0dbf85e164c9d4aadc42a4c50eef6ef9cd26e | |
| parent | 4c898ffc40b003cd5897684d0c74b7ca5a3595e0 (diff) | |
| download | vcpkg-e2d5324c5792845520085c4289d63f6d9a7c45ff.tar.gz vcpkg-e2d5324c5792845520085c4289d63f6d9a7c45ff.zip | |
[cryptopp] fix build by disabling assembly on osx (#6821)
* [cryptopp] fix build by disabling assembly on osx
* [cryptopp] Bump control version
| -rw-r--r-- | ports/cryptopp/CONTROL | 2 | ||||
| -rw-r--r-- | ports/cryptopp/portfile.cmake | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/ports/cryptopp/CONTROL b/ports/cryptopp/CONTROL index e3a5d79de..c65a43c90 100644 --- a/ports/cryptopp/CONTROL +++ b/ports/cryptopp/CONTROL @@ -1,3 +1,3 @@ Source: cryptopp -Version: 8.1.0 +Version: 8.1.0-1 Description: Crypto++ is a free C++ class library of cryptographic schemes. diff --git a/ports/cryptopp/portfile.cmake b/ports/cryptopp/portfile.cmake index b4f35e7e6..ad6557f77 100644 --- a/ports/cryptopp/portfile.cmake +++ b/ports/cryptopp/portfile.cmake @@ -26,6 +26,14 @@ vcpkg_from_github( file(COPY ${CMAKE_SOURCE_PATH}/cryptopp-config.cmake DESTINATION ${SOURCE_PATH}) file(COPY ${CMAKE_SOURCE_PATH}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +# disable assembly on OSX to fix broken build +if(APPLE) + set(CRYPTOPP_DISABLE_ASM "ON") +else() + set(CRYPTOPP_DISABLE_ASM "OFF") +endif() + + # Dynamic linking should be avoided for Crypto++ to reduce the attack surface, # so generate a static lib for both dynamic and static vcpkg targets. # See also: @@ -40,6 +48,7 @@ vcpkg_configure_cmake( -DBUILD_STATIC=ON -DBUILD_TESTING=OFF -DBUILD_DOCUMENTATION=OFF + -DDISABLE_ASM=${CRYPTOPP_DISABLE_ASM} ) vcpkg_install_cmake() |