mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 12:17:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[double-conversion] Remove unnecessary patch (#4321)

Browse Source 
* [double-conversion] Remove unnecessary patch

* [double-conversion] Small portfile improvement

* [double-conversion] Provoke rebuild
This commit is contained in:
myd7349 2018-10-26 06:53:48 +08:00 committed by Robert Schumacher
parent 8174938d50
commit 30d5f95986
3 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ports/double-conversion/001-fix-arm.patch
View File

@ -1,13 +0,0 @@
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__) || \

2
ports/double-conversion/CONTROL
View File

@ -1,3 +1,3 @@
Source: double-conversion Source: double-conversion
Version: 3.1.0 Version: 3.1.0-1
Description: Efficient binary-decimal and decimal-binary conversion routines for IEEE doubles. Description: Efficient binary-decimal and decimal-binary conversion routines for IEEE doubles.

9
ports/double-conversion/portfile.cmake
View File

@ -8,11 +8,6 @@ vcpkg_from_github(
HEAD_REF master HEAD_REF master
) )
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES ${CMAKE_CURRENT_LIST_DIR}/001-fix-arm.patch
)
vcpkg_configure_cmake( vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA PREFER_NINJA
@ -29,9 +24,7 @@ endif()
vcpkg_copy_pdbs() vcpkg_copy_pdbs()
# Include files should not be duplicated into the /debug/include directory.
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
# Handle copyright # Handle copyright
file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/double-conversion) configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/double-conversion/copyright COPYONLY)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/double-conversion/LICENSE ${CURRENT_PACKAGES_DIR}/share/double-conversion/copyright)