diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-10-14 21:57:18 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-10-14 21:57:30 -0700 |
| commit | 1f84970219822f8cf124925f7e8923c797a7d883 (patch) | |
| tree | a3f9e6e182a2608cf0ce5c0f348f8af1286387a4 | |
| parent | 561cfe89e653aef903488f7af7d4d17cfb11a26c (diff) | |
| download | vcpkg-1f84970219822f8cf124925f7e8923c797a7d883.tar.gz vcpkg-1f84970219822f8cf124925f7e8923c797a7d883.zip | |
[abseil] Remove patch that has already been upstreamed. Fixes #1977
| -rw-r--r-- | ports/abseil/fix-intrin.patch | 12 | ||||
| -rw-r--r-- | ports/abseil/portfile.cmake | 5 |
2 files changed, 0 insertions, 17 deletions
diff --git a/ports/abseil/fix-intrin.patch b/ports/abseil/fix-intrin.patch deleted file mode 100644 index 285adde0f..000000000 --- a/ports/abseil/fix-intrin.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/absl/base/optimization.h b/absl/base/optimization.h -index db8beaf..aaaffa4 100644 ---- a/absl/base/optimization.h -+++ b/absl/base/optimization.h -@@ -46,6 +46,7 @@ - // GCC will not tail call given inline volatile assembly. - #define ABSL_BLOCK_TAIL_CALL_OPTIMIZATION() __asm__ __volatile__("") - #elif defined(_MSC_VER) -+#include <intrin.h> - // The __nop() intrinsic blocks the optimisation. - #define ABSL_BLOCK_TAIL_CALL_OPTIMIZATION() __nop() - #else diff --git a/ports/abseil/portfile.cmake b/ports/abseil/portfile.cmake index 8273f80e3..d74369951 100644 --- a/ports/abseil/portfile.cmake +++ b/ports/abseil/portfile.cmake @@ -15,11 +15,6 @@ vcpkg_from_github( HEAD_REF master
)
-vcpkg_apply_patches(
- SOURCE_PATH ${SOURCE_PATH}
- PATCHES "${CMAKE_CURRENT_LIST_DIR}/fix-intrin.patch"
-)
-
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
vcpkg_configure_cmake(
|