libdouble-conversion: Update to 3.1.5 9139/head
authorRosen Penev <rosenp@gmail.com>
Tue, 4 Jun 2019 02:51:52 +0000 (19:51 -0700)
committerRosen Penev <rosenp@gmail.com>
Tue, 4 Jun 2019 02:52:44 +0000 (19:52 -0700)
Remove Upstreamed patch.

Replace InstallDev section with CMAKE_INSTALL.

Cleanup Install section.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
libs/libdouble-conversion/Makefile
libs/libdouble-conversion/patches/010-armeb.patch [deleted file]

index ac7e4f93407e4b590587c59a0688318df8d44437..7800a94ad3c83ebce05361a7c00d47f3e3189f24 100644 (file)
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libdouble-conversion
-PKG_VERSION:=3.1.4
-PKG_RELEASE:=2
+PKG_VERSION:=3.1.5
+PKG_RELEASE:=1
 
 PKG_SOURCE:=double-conversion-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/google/double-conversion/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=95004b65e43fefc6100f337a25da27bb99b9ef8d4071a36a33b5e83eb1f82021
+PKG_HASH:=a63ecb93182134ba4293fd5f22d6e08ca417caafa244afaa751cbfddf6415b13
 
 HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/double-conversion-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/double-conversion-$(PKG_VERSION)
@@ -22,6 +22,8 @@ PKG_MAINTAINER:=
 PKG_LICENSE:=BSD-3c
 PKG_LICENSE_FILES:=COPYING LICENSE
 
+CMAKE_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/cmake.mk
@@ -43,30 +45,12 @@ define Package/libdouble-conversion/description
 endef
 
 CMAKE_OPTIONS += \
-  -DBUILD_SHARED_LIBS=ON \
-  -DBUILD_TESTING=OFF
-
-define Build/InstallDev
-       $(INSTALL_DIR) \
-         $(1)/usr/lib \
-         $(1)/usr/include/double-conversion
-
-       $(CP) \
-         $(PKG_INSTALL_DIR)/usr/include/* \
-         $(1)/usr/include/
-
-       $(INSTALL_DATA) \
-         $(PKG_INSTALL_DIR)/usr/lib/lib*.so* \
-         $(1)/usr/lib/
-endef
+       -DBUILD_SHARED_LIBS=ON \
+       -DBUILD_TESTING=OFF
 
 define Package/libdouble-conversion/install
-       $(INSTALL_DIR) \
-         $(1)/usr/lib
-
-       $(INSTALL_DATA) \
-         $(PKG_INSTALL_DIR)/usr/lib/lib*.so* \
-         $(1)/usr/lib/
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/lib*.so* $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libdouble-conversion))
diff --git a/libs/libdouble-conversion/patches/010-armeb.patch b/libs/libdouble-conversion/patches/010-armeb.patch
deleted file mode 100644 (file)
index 29c397e..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/double-conversion/utils.h
-+++ b/double-conversion/utils.h
-@@ -91,7 +91,7 @@ int main(int argc, char** argv) {
-     defined(_POWER) || defined(_ARCH_PPC) || defined(_ARCH_PPC64) || \
-     defined(__sparc__) || defined(__sparc) || defined(__s390__) || \
-     defined(__SH4__) || defined(__alpha__) || \
--    defined(_MIPS_ARCH_MIPS32R2) || \
-+    defined(_MIPS_ARCH_MIPS32R2) || defined(__ARMEB__) || \
-     defined(__AARCH64EL__) || defined(__aarch64__) || defined(__AARCH64EB__) || \
-     defined(__riscv) || \
-     defined(__or1k__) || defined(__arc__) || \