mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-18 13:05:24 +08:00
[libsodium] Fix mingw builds (#18025)
* [libsodium] Fix mingw builds * Run x-add-version libsodium
This commit is contained in:
parent
449b85b1e5
commit
8f8a4f8aee
@ -132,7 +132,6 @@ else ()
|
||||
INTERFACE
|
||||
-flax-vector-conversions
|
||||
-fvisibility=hidden
|
||||
-fPIC
|
||||
-fwrapv
|
||||
-Wall
|
||||
-Wextra
|
||||
@ -162,11 +161,31 @@ else ()
|
||||
-Wswitch-enum
|
||||
#-Wvariable-decl
|
||||
-Wwrite-strings
|
||||
-Wl,-z,relro
|
||||
-Wl,-z,now
|
||||
-Wl,-z,noexecstack
|
||||
)
|
||||
|
||||
if (NOT MINGW)
|
||||
target_compile_options(${PROJECT_NAME}_config_private
|
||||
INTERFACE
|
||||
-fPIC
|
||||
-Wl,-z,relro
|
||||
-Wl,-z,now
|
||||
-Wl,-z,noexecstack
|
||||
)
|
||||
endif()
|
||||
|
||||
if (MINGW)
|
||||
target_compile_options(${PROJECT_NAME}_config_private
|
||||
INTERFACE
|
||||
-fno-asynchronous-unwind-tables
|
||||
)
|
||||
target_link_options(${PROJECT_NAME}_config_private
|
||||
INTERFACE
|
||||
-Wl,--dynamicbase
|
||||
-Wl,--high-entropy-va
|
||||
-Wl,--nxcompat
|
||||
)
|
||||
endif()
|
||||
|
||||
if (CMAKE_C_COMPILER_ID STREQUAL "Clang" OR
|
||||
CMAKE_C_COMPILER_ID STREQUAL "AppleClang")
|
||||
target_compile_options(${PROJECT_NAME}_config_private
|
||||
@ -187,11 +206,11 @@ else ()
|
||||
target_compile_options(${PROJECT_NAME}_config_public INTERFACE -pthread)
|
||||
endif ()
|
||||
|
||||
if (ENABLE_SSP)
|
||||
if (ENABLE_SSP AND NOT MINGW)
|
||||
target_compile_options(${PROJECT_NAME}_config_private INTERFACE -fstack-protector-all)
|
||||
endif ()
|
||||
|
||||
if (ENABLE_PIE)
|
||||
if (ENABLE_PIE AND NOT MINGW)
|
||||
target_compile_options(${PROJECT_NAME}_config_private INTERFACE -fPIE)
|
||||
endif ()
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "libsodium",
|
||||
"version-string": "1.0.18",
|
||||
"port-version": 4,
|
||||
"version": "1.0.18",
|
||||
"port-version": 5,
|
||||
"description": "A modern and easy-to-use crypto library",
|
||||
"homepage": "https://github.com/jedisct1/libsodium",
|
||||
"dependencies": [
|
||||
|
@ -3506,7 +3506,7 @@
|
||||
},
|
||||
"libsodium": {
|
||||
"baseline": "1.0.18",
|
||||
"port-version": 4
|
||||
"port-version": 5
|
||||
},
|
||||
"libsoundio": {
|
||||
"baseline": "2.0.0",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "8b1c2632e8f7c23408a655d6c97b6d51ad354a19",
|
||||
"version": "1.0.18",
|
||||
"port-version": 5
|
||||
},
|
||||
{
|
||||
"git-tree": "6ec1ee39e69052d50e773857064d2d06968ee8c3",
|
||||
"version-string": "1.0.18",
|
||||
|
Loading…
Reference in New Issue
Block a user