diff options
| author | Long Nguyen <nguyen.long.908132@gmail.com> | 2020-08-08 01:42:21 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-07 11:42:21 -0700 |
| commit | 80ef2a34554283e7a926242b0353b103aa3aae48 (patch) | |
| tree | 3d2a2a0ba435db6accb7f96144e1ee79d51cc7a3 | |
| parent | 23d4072643dbd3a92d65ad26c8923ce8a829936f (diff) | |
| download | vcpkg-80ef2a34554283e7a926242b0353b103aa3aae48.tar.gz vcpkg-80ef2a34554283e7a926242b0353b103aa3aae48.zip | |
[flac] Disable stack smash protection and FORTIFY_SOURCE for mingw (#12761)
* [flac] Disable stack smash protection and FORTIFY_SOURCE for mingw
* Change flag injection + copyright install
| -rw-r--r-- | ports/libflac/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libflac/portfile.cmake | 14 |
2 files changed, 12 insertions, 4 deletions
diff --git a/ports/libflac/CONTROL b/ports/libflac/CONTROL index 4c57d1f68..696e9fffb 100644 --- a/ports/libflac/CONTROL +++ b/ports/libflac/CONTROL @@ -1,6 +1,6 @@ Source: libflac Version: 1.3.3 -Port-Version: 2 +Port-Version: 3 Homepage: https://xiph.org/flac/ Description: Library for manipulating FLAC files Build-Depends: libogg diff --git a/ports/libflac/portfile.cmake b/ports/libflac/portfile.cmake index ab126edd9..36f7b997e 100644 --- a/ports/libflac/portfile.cmake +++ b/ports/libflac/portfile.cmake @@ -15,6 +15,14 @@ else() set(BUILD_SHARED_LIBS OFF) endif() +if(VCPKG_TARGET_IS_MINGW) + set(WITH_STACK_PROTECTOR OFF) + string(APPEND VCPKG_C_FLAGS "-D_FORTIFY_SOURCE=0") + string(APPEND VCPKG_CXX_FLAGS "-D_FORTIFY_SOURCE=0") +else() + set(WITH_STACK_PROTECTOR ON) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -23,7 +31,8 @@ vcpkg_configure_cmake( -DBUILD_EXAMPLES=OFF -DBUILD_DOCS=OFF -DBUILD_TESTING=OFF - -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}) + -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} + -DWITH_STACK_PROTECTOR=${WITH_STACK_PROTECTOR}) vcpkg_install_cmake() vcpkg_fixup_cmake_targets( @@ -57,5 +66,4 @@ endif() # This license (BSD) is relevant only for library - if someone would want to install # FLAC cmd line tools as well additional license (GPL) should be included -file(COPY ${SOURCE_PATH}/COPYING.Xiph DESTINATION ${CURRENT_PACKAGES_DIR}/share/libflac) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/libflac/COPYING.Xiph ${CURRENT_PACKAGES_DIR}/share/libflac/copyright) +file(INSTALL ${SOURCE_PATH}/COPYING.Xiph DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) |