Fix double conversion build

microsoft · May 25, 2017 · c5d7766 · c5d7766
1 parent dfaa7a8
commit c5d7766
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/ports/double-conversion/001-fix-arm.patch b/ports/double-conversion/001-fix-arm.patch
@@ -0,0 +1,13 @@
+diff --git a/double-conversion/utils.h b/double-conversion/utils.h"
+index 51d5e61..24cd5f1 100644
+--- a/double-conversion/utils.h
++++ "b/double-conversion/utils.h"
+@@ -68,7 +68,7 @@ inline void abort_noreturn() { abort(); }
+ // disabled.)
+ // On Linux,x86 89255e-22 != Div_double(89255.0/1e22)
+ #if defined(_M_X64) || defined(__x86_64__) || \
+-    defined(__ARMEL__) || defined(__avr32__) || \
++    defined(__ARMEL__) || defined(__avr32__) || defined(_M_ARM) || \
+     defined(__hppa__) || defined(__ia64__) || \
+     defined(__mips__) || \
+     defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \
diff --git a/ports/double-conversion/portfile.cmake b/ports/double-conversion/portfile.cmake
@@ -22,6 +22,12 @@ vcpkg_download_distfile(ARCHIVE
     SHA512 1406dc22b4ea71e1a2490f96cfed3230e122b97607c83ba106df4e90c7e4bfdcfc136c88741e7f1127237b38b4944d462ec5a4627a71f5ea3fe14afbcc64cd44
 )
 vcpkg_extract_source_archive(${ARCHIVE})
+
+vcpkg_apply_patches(
+    SOURCE_PATH ${SOURCE_PATH}
+    PATCHES ${CMAKE_CURRENT_LIST_DIR}/001-fix-arm.patch
+)
+
 vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH}
     OPTIONS -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=True)
 vcpkg_install_cmake()