diff options
| author | Cheney Wang <38240633+Cheney-W@users.noreply.github.com> | 2019-06-13 06:44:25 +0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-06-12 15:44:25 -0700 |
| commit | d4412e0ee2c8842bf54f0d70aeb07d184578bc1f (patch) | |
| tree | b18ac98b8308f82b84bf9f2d533d4e8910f4b1ef | |
| parent | b7d6160b80f417137bc480137b946c91f3272bf5 (diff) | |
| download | vcpkg-d4412e0ee2c8842bf54f0d70aeb07d184578bc1f.tar.gz vcpkg-d4412e0ee2c8842bf54f0d70aeb07d184578bc1f.zip | |
[glew] Disable the link option /nodefaultlib and /noentry (#6853)
* [glew] Disable the link option /nodefaultlib and /noentry
* [glew] Combine with vcpkg_extract_source_archive_ex
| -rw-r--r-- | ports/glew/CONTROL | 2 | ||||
| -rw-r--r-- | ports/glew/fix-LNK2019.patch | 13 | ||||
| -rw-r--r-- | ports/glew/portfile.cmake | 9 |
3 files changed, 21 insertions, 3 deletions
diff --git a/ports/glew/CONTROL b/ports/glew/CONTROL index 54b2d09df..13cc92230 100644 --- a/ports/glew/CONTROL +++ b/ports/glew/CONTROL @@ -1,3 +1,3 @@ Source: glew
-Version: 2.1.0-3
+Version: 2.1.0-4
Description: The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library.
diff --git a/ports/glew/fix-LNK2019.patch b/ports/glew/fix-LNK2019.patch new file mode 100644 index 000000000..d45e61a88 --- /dev/null +++ b/ports/glew/fix-LNK2019.patch @@ -0,0 +1,13 @@ +diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt
+index 5081e0f..f76725a 100644
+--- a/build/cmake/CMakeLists.txt
++++ b/build/cmake/CMakeLists.txt
+@@ -108,7 +108,7 @@ if (MSVC)
+ target_compile_options (glew PRIVATE -GS-)
+ target_compile_options (glew_s PRIVATE -GS-)
+ # remove stdlib dependency
+- target_link_libraries (glew LINK_PRIVATE -nodefaultlib -noentry)
++ # target_link_libraries (glew LINK_PRIVATE -nodefaultlib -noentry)
+ string(REGEX REPLACE "/RTC(su|[1su])" "" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
+ elseif (WIN32 AND ((CMAKE_C_COMPILER_ID MATCHES "GNU") OR (CMAKE_C_COMPILER_ID MATCHES "Clang")))
+ # remove stdlib dependency on windows with GCC and Clang (for similar reasons
diff --git a/ports/glew/portfile.cmake b/ports/glew/portfile.cmake index 9b982db7f..f05934f05 100644 --- a/ports/glew/portfile.cmake +++ b/ports/glew/portfile.cmake @@ -1,6 +1,6 @@ include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/glew/glew-2.1.0) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/glew-58abdfb190) # Don't change to vcpkg_from_github! The github-auto-generated archives are missing some files. # More info: https://github.com/nigels-com/glew/issues/31 and https://github.com/nigels-com/glew/issues/13 @@ -9,7 +9,12 @@ vcpkg_download_distfile(ARCHIVE_FILE FILENAME "glew-2.1.0.tgz" SHA512 9a9b4d81482ccaac4b476c34ed537585ae754a82ebb51c3efa16d953c25cc3931be46ed2e49e79c730cd8afc6a1b78c97d52cd714044a339c3bc29734cd4d2ab ) -vcpkg_extract_source_archive(${ARCHIVE_FILE} ${CURRENT_BUILDTREES_DIR}/src/glew) +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH ${SOURCE_PATH} + ARCHIVE ${ARCHIVE_FILE} + REF glew + PATCHES fix-LNK2019.patch +) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH}/build/cmake |