aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ports/double-conversion/001-fix-arm.patch13
-rw-r--r--ports/double-conversion/CONTROL2
-rw-r--r--ports/double-conversion/portfile.cmake9
3 files changed, 2 insertions, 22 deletions
diff --git a/ports/double-conversion/001-fix-arm.patch b/ports/double-conversion/001-fix-arm.patch
deleted file mode 100644
index 98ce2080c..000000000
--- a/ports/double-conversion/001-fix-arm.patch
+++ /dev/null
@@ -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__) || \
diff --git a/ports/double-conversion/CONTROL b/ports/double-conversion/CONTROL
index 66cf5b1dd..a80898deb 100644
--- a/ports/double-conversion/CONTROL
+++ b/ports/double-conversion/CONTROL
@@ -1,3 +1,3 @@
Source: double-conversion
-Version: 3.1.0
+Version: 3.1.0-1
Description: Efficient binary-decimal and decimal-binary conversion routines for IEEE doubles.
diff --git a/ports/double-conversion/portfile.cmake b/ports/double-conversion/portfile.cmake
index 99be98024..875b1aa0a 100644
--- a/ports/double-conversion/portfile.cmake
+++ b/ports/double-conversion/portfile.cmake
@@ -8,11 +8,6 @@ vcpkg_from_github(
HEAD_REF master
)
-vcpkg_apply_patches(
- SOURCE_PATH ${SOURCE_PATH}
- PATCHES ${CMAKE_CURRENT_LIST_DIR}/001-fix-arm.patch
-)
-
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
@@ -29,9 +24,7 @@ endif()
vcpkg_copy_pdbs()
-# Include files should not be duplicated into the /debug/include directory.
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
# Handle copyright
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/double-conversion)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/double-conversion/LICENSE ${CURRENT_PACKAGES_DIR}/share/double-conversion/copyright)
+configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/double-conversion/copyright COPYONLY)