From a12398c92b21c16e6ea43a83bd4fefce23005eaf Mon Sep 17 00:00:00 2001 From: lean Date: Tue, 15 Jun 2021 00:20:33 +0800 Subject: [PATCH] libuv: bump version --- lang/node/Makefile | 2 +- libs/c-ares/Makefile | 31 ++++++++++++++++--------------- libs/libuv/Makefile | 10 +++++----- 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/lang/node/Makefile b/lang/node/Makefile index 87126f59..f3ed92af 100644 --- a/lang/node/Makefile +++ b/lang/node/Makefile @@ -71,7 +71,7 @@ define Package/node/config if PACKAGE_node choice prompt "i18n features" - default NODEJS_ICU_SMALL + default NODEJS_ICU_NONE help Select i18n features diff --git a/libs/c-ares/Makefile b/libs/c-ares/Makefile index dcc3789e..885b8181 100644 --- a/libs/c-ares/Makefile +++ b/libs/c-ares/Makefile @@ -9,22 +9,21 @@ include $(TOPDIR)/rules.mk PKG_NAME:=c-ares -PKG_VERSION:=1.16.1 +PKG_VERSION:=1.17.1 PKG_RELEASE:=1 -PKG_LICENSE:=MIT -PKG_CPE_ID:=cpe:/a:c-ares_project:c-ares PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://c-ares.haxx.se/download -PKG_HASH:=d08312d0ecc3bd48eee0a4cc0d2137c9f194e0a28de2028928c0f6cae85f86ce +PKG_HASH:=d73dd0f6de824afd407ce10750ea081af47eba52b8a6cb307d220131ad93fc40 -PKG_FIXUP:=autoreconf -PKG_INSTALL:=1 +PKG_LICENSE:=MIT +PKG_LICENSE_FILES:=LICENSE.md +PKG_CPE_ID:=cpe:/a:c-ares_project:c-ares + +CMAKE_INSTALL:=1 include $(INCLUDE_DIR)/package.mk - -TARGET_CPPFLAGS += $(filter -D%,$(TARGET_CFLAGS)) -TARGET_CFLAGS := $(filter-out -D%,$(TARGET_CFLAGS)) +include $(INCLUDE_DIR)/cmake.mk define Package/libcares SECTION:=libs @@ -42,14 +41,16 @@ Netware, Android and many more operating systems. endef +CMAKE_OPTIONS += \ + -DCARES_STATIC=OFF \ + -DCARES_SHARED=ON \ + -DCARES_STATIC_PIC=ON \ + -DCARES_BUILD_TESTS=OFF \ + -DCARES_BUILD_TOOLS=OFF + define Package/libcares/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so.* $(1)/usr/lib/ -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1) - $(CP) $(PKG_INSTALL_DIR)/* $(1)/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcares.so.* $(1)/usr/lib/ endef $(eval $(call BuildPackage,libcares)) diff --git a/libs/libuv/Makefile b/libs/libuv/Makefile index de49ee37..251cc55f 100644 --- a/libs/libuv/Makefile +++ b/libs/libuv/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libuv -PKG_VERSION:=1.34.2 -PKG_RELEASE:=1 +PKG_VERSION:=1.41.0 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://dist.libuv.org/dist/v$(PKG_VERSION)/ -PKG_HASH:=65d93b4504ef5f3ec784c0c186f4ba8abd1031292c7f15dda8111d7e319adf46 +PKG_HASH:=1184533907e1ddad9c0dcd30a5abb0fe25288c287ff7fee303fff7b9b2d6eb6e PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-v$(PKG_VERSION) PKG_MAINTAINER:=Marko Ratkaj @@ -21,9 +21,7 @@ PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE PKG_CPE_ID:=cpe:/a:libuv_project:libuv -CMAKE_INSTALL:=1 CMAKE_BINARY_SUBDIR:=out/cmake -PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk @@ -49,6 +47,8 @@ define Build/InstallDev $(call Build/InstallDev/cmake,$(1)) $(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/libuv.pc $(SED) 's,/usr/lib,$$$${prefix}/lib,g' $(1)/usr/lib/pkgconfig/libuv.pc + $(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/libuv-static.pc + $(SED) 's,/usr/lib,$$$${prefix}/lib,g' $(1)/usr/lib/pkgconfig/libuv-static.pc endef define Package/libuv/install