From 79831ee0abf663faefe179f9a2ae8d84049078bb Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Sat, 22 Jun 2019 19:12:42 +0200 Subject: [PATCH 1/2] boost: Makefile polishing Corrected License according to SPDX in PKG_LICENSE Added PKG_LICENSE_FILES HTTPS in their website Reordered some stuff Signed-off-by: Josef Schlehofer --- libs/boost/Makefile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libs/boost/Makefile b/libs/boost/Makefile index 9f0c0b473..db6c40076 100644 --- a/libs/boost/Makefile +++ b/libs/boost/Makefile @@ -17,11 +17,14 @@ PKG_RELEASE:=6 PKG_SOURCE:=$(PKG_NAME)_$(PKG_SOURCE_VERSION).tar.bz2 PKG_SOURCE_URL:=@SF/$(PKG_NAME)/$(PKG_NAME)/$(PKG_VERSION) https://dl.bintray.com/boostorg/release/$(PKG_VERSION)/source/ -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)_$(PKG_SOURCE_VERSION) -HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)_$(PKG_SOURCE_VERSION) PKG_HASH:=430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778 -PKG_LICENSE:=Boost Software License + PKG_MAINTAINER:=Carlos M. Ferreira +PKG_LICENSE:=BSL-1.0 +PKG_LICENSE_FILES:=LICENSE_1_0.txt + +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)_$(PKG_SOURCE_VERSION) +HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)_$(PKG_SOURCE_VERSION) PKG_BUILD_PARALLEL:=1 PKG_USE_MIPS16:=0 @@ -33,7 +36,7 @@ define Package/boost/Default SECTION:=libs CATEGORY:=Libraries TITLE:=Boost C++ source library - URL:=http://www.boost.org + URL:=https://www.boost.org DEPENDS:=+libstdcpp +libpthread +librt endef From af4cacd10869b8e7996c540643bb6f2cd32a8a12 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sat, 22 Jun 2019 19:15:55 +0200 Subject: [PATCH 2/2] boost: fix raw kconfig syntax Signed-off-by: Jo-Philipp Wich Signed-off-by: Josef Schlehofer --- libs/boost/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libs/boost/Makefile b/libs/boost/Makefile index db6c40076..182a57378 100644 --- a/libs/boost/Makefile +++ b/libs/boost/Makefile @@ -13,7 +13,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=boost PKG_VERSION:=1.70.0 PKG_SOURCE_VERSION:=1_70_0 -PKG_RELEASE:=6 +PKG_RELEASE:=7 PKG_SOURCE:=$(PKG_NAME)_$(PKG_SOURCE_VERSION).tar.bz2 PKG_SOURCE_URL:=@SF/$(PKG_NAME)/$(PKG_NAME)/$(PKG_VERSION) https://dl.bintray.com/boostorg/release/$(PKG_VERSION)/source/ @@ -199,11 +199,11 @@ define Package/boost/config bool "Shared" config boost-runtime-static - depends on @(!boost-shared-libs&&!boost-static-and-shared-libs) + depends on !boost-shared-libs&&!boost-static-and-shared-libs bool "Static" config boost-runtime-static-and-shared - depends on @(boost-use-name-tags&&!boost-shared-libs&&!boost-static-and-shared-libs) + depends on boost-use-name-tags&&!boost-shared-libs&&!boost-static-and-shared-libs bool "Both" endchoice @@ -240,14 +240,14 @@ define Package/boost/config default n config boost-single-thread - depends on @boost-use-name-tags + depends on boost-use-name-tags bool "Single thread Support." help Compile Boost libraries in single-thread mode. default n config boost-build-type-complete - depends on @boost-use-name-tags + depends on boost-use-name-tags bool "Complete Boost Build." help Builds both release and debug libs. It will take much longer to compile. @@ -277,7 +277,7 @@ define Package/boost/config select PACKAGE_boost-test config boost-coroutine2 - depends on !@GCC_VERSION_4_8 + depends on !GCC_VERSION_4_8 bool "Boost couroutine2 support." select PACKAGE_boost-coroutine default n