libdouble-conversion: Update to 3.1.5
Remove Upstreamed patch. Replace InstallDev section with CMAKE_INSTALL. Cleanup Install section. Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
parent
81440bd35b
commit
22d5b005c9
2 changed files with 9 additions and 36 deletions
|
@ -8,12 +8,12 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=libdouble-conversion
|
PKG_NAME:=libdouble-conversion
|
||||||
PKG_VERSION:=3.1.4
|
PKG_VERSION:=3.1.5
|
||||||
PKG_RELEASE:=2
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE:=double-conversion-$(PKG_VERSION).tar.gz
|
PKG_SOURCE:=double-conversion-$(PKG_VERSION).tar.gz
|
||||||
PKG_SOURCE_URL:=https://codeload.github.com/google/double-conversion/tar.gz/v$(PKG_VERSION)?
|
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)
|
HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/double-conversion-$(PKG_VERSION)
|
||||||
PKG_BUILD_DIR:=$(BUILD_DIR)/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:=BSD-3c
|
||||||
PKG_LICENSE_FILES:=COPYING LICENSE
|
PKG_LICENSE_FILES:=COPYING LICENSE
|
||||||
|
|
||||||
|
CMAKE_INSTALL:=1
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/package.mk
|
include $(INCLUDE_DIR)/package.mk
|
||||||
include $(INCLUDE_DIR)/host-build.mk
|
include $(INCLUDE_DIR)/host-build.mk
|
||||||
include $(INCLUDE_DIR)/cmake.mk
|
include $(INCLUDE_DIR)/cmake.mk
|
||||||
|
@ -43,30 +45,12 @@ define Package/libdouble-conversion/description
|
||||||
endef
|
endef
|
||||||
|
|
||||||
CMAKE_OPTIONS += \
|
CMAKE_OPTIONS += \
|
||||||
-DBUILD_SHARED_LIBS=ON \
|
-DBUILD_SHARED_LIBS=ON \
|
||||||
-DBUILD_TESTING=OFF
|
-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
|
|
||||||
|
|
||||||
define Package/libdouble-conversion/install
|
define Package/libdouble-conversion/install
|
||||||
$(INSTALL_DIR) \
|
$(INSTALL_DIR) $(1)/usr/lib
|
||||||
$(1)/usr/lib
|
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/lib*.so* $(1)/usr/lib/
|
||||||
|
|
||||||
$(INSTALL_DATA) \
|
|
||||||
$(PKG_INSTALL_DIR)/usr/lib/lib*.so* \
|
|
||||||
$(1)/usr/lib/
|
|
||||||
endef
|
endef
|
||||||
|
|
||||||
$(eval $(call BuildPackage,libdouble-conversion))
|
$(eval $(call BuildPackage,libdouble-conversion))
|
||||||
|
|
|
@ -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__) || \
|
|
Loading…
Reference in a new issue