Skip to contentSkip to conversation

cc-tool: drop BR2_PACKAGE_BOOST_SIGNALS select

PATCH New Fabrice Fontaine 3 participants 5 messages Jan 13, 2019 – Jan 24, 2019

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 cc-tool: drop BR2_PACKAGE_BOOST_SIGNALS select

cc-tool depends on signals2 not signals, indeed only signals2 is used in src/data/progress_watcher.h and BOOST_SIGNALS defined in m4/boost.m4 is never used in configure.ac

No BR2_PACKAGE_SIGNALS2 is needed as signals2 is a header-only boost library

---
Changes v1 -> v2 (after review of Thomas Petazzoni):
- Give more details in commit log

 package/cc-tool/Config.in | 1 -
 1 file changed, 1 deletion(-)
package/cc-tool/Config.in +0 -1
index 32250db3af..67c67a3992 100644
@@ -10,7 +10,6 @@ config BR2_PACKAGE_CC_TOOL
 	select BR2_PACKAGE_BOOST_SYSTEM
 	select BR2_PACKAGE_BOOST_REGEX
 	select BR2_PACKAGE_BOOST_FILESYSTEM
-	select BR2_PACKAGE_BOOST_SIGNALS
 	help
 	  cc-tool provides support for Texas Instruments CC Debugger
 	  for Linux OS in order to program 8051-based System-On-Chip
Signature · 1 line
2.14.1
#1 lore raw

PATCH v2 2/2 boost: bump to version 1.69.0

- Remove fifth patch (already in version)
- Remove BR2_PACKAGE_BOOST_SIGNALS as signals is now removed. Its removal was announced in 1.68 and its deprecation was announced in 1.54. Users are encouraged to use Signals2 instead.

---
 Config.in.legacy                                   |  7 ++
 ...static-detection-of-lock-free-atomic-ints.patch | 80 ----------------------
 package/boost/Config.in                            |  5 --
 package/boost/boost.hash                           |  4 +-
 package/boost/boost.mk                             |  6 +-
 5 files changed, 11 insertions(+), 91 deletions(-)
 delete mode 100644 package/boost/0005-fix-static-detection-of-lock-free-atomic-ints.patch
Config.in.legacy +7 -0
index 6f1e3eef2b..ac8c07075c 100644
@@ -146,6 +146,13 @@ endif
 
 comment "Legacy options removed in 2019.02"
 
+config BR2_PACKAGE_BOOST_SIGNALS
+	bool "Boost signals removed"
+	select BR2_LEGACY
+	help
+	  Its removal was announced in boost 1.68 and its deprecation was
+	  announced in 1.54. Users are encouraged to use Signals2 instead.
+
 config BR2_PACKAGE_LUA_5_2
 	bool "Lua 5.2.x version removed"
 	select BR2_LEGACY
package/boost/0005-fix-static-detection-of-lock-free-atomic-ints.patch deleted +0 -80

80 lines not on this page · raw message

package/boost/Config.in +0 -5
index 93e30c4f2b..3eeb4c92d2 100644
@@ -279,11 +279,6 @@ config BR2_PACKAGE_BOOST_SERIALIZATION
 	help
 	  Serialization for persistence and marshalling.
 
-config BR2_PACKAGE_BOOST_SIGNALS
-	bool "boost-signals"
-	help
-	  Managed signals & slots callback implementation.
-
 config BR2_PACKAGE_BOOST_STACKTRACE
 	bool "boost-stacktrace"
 	depends on !BR2_STATIC_LIBS
package/boost/boost.hash +2 -2
index f3322aed98..c67c3f4a54 100644
@@ -1,5 +1,5 @@
-# From http://www.boost.org/users/history/version_1_68_0.html
-sha256 7f6130bc3cf65f56a618888ce9d5ea704fa10b462be126ad053e80e553d6d8b7  boost_1_68_0.tar.bz2
+# From http://www.boost.org/users/history/version_1_69_0.html
+sha256 8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406  boost_1_69_0.tar.bz2
 
 # Locally computed
 sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566  LICENSE_1_0.txt
package/boost/boost.mk +2 -4
index 14f6162003..576e597afa 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-BOOST_VERSION = 1.68.0
+BOOST_VERSION = 1.69.0
 BOOST_SOURCE = boost_$(subst .,_,$(BOOST_VERSION)).tar.bz2
 BOOST_SITE = http://downloads.sourceforge.net/project/boost/boost/$(BOOST_VERSION)
 BOOST_INSTALL_STAGING = YES
@@ -16,8 +16,7 @@ HOST_BOOST_FLAGS = --without-icu --with-toolset=gcc \
 	--without-libraries=$(subst $(space),$(comma),atomic chrono context \
 	contract coroutine date_time exception filesystem graph graph_parallel \
 	iostreams locale log math mpi program_options python random regex \
-	serialization signals system test thread timer type_erasure \
-	wave)
+	serialization system test thread timer type_erasure wave)
 
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_ATOMIC),,atomic)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CHRONO),,chrono)
@@ -41,7 +40,6 @@ BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_PYTHON),,python)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_RANDOM),,random)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_REGEX),,regex)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_SERIALIZATION),,serialization)
-BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_SIGNALS),,signals)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_STACKTRACE),,stacktrace)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_SYSTEM),,system)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_TEST),,test)
Signature · 1 line
2.14.1
#2 lore raw

PATCH v2 2/2 boost: bump to version 1.69.0

Hello,

Quoted 6 lines · Fabrice Fontaine

- Remove fifth patch (already in version)
- Remove BR2_PACKAGE_BOOST_SIGNALS as signals is now removed. Its removal was announced in 1.68 and its deprecation was announced in 1.54. Users are encouraged to use Signals2 instead.

The Config.in.legacy text did not pass check-package verification, the lines were too long. I fixed that up, and applied. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#3 lore raw

PATCH v2 1/2 cc-tool: drop BR2_PACKAGE_BOOST_SIGNALS select

In reply to Fabrice Fontaine

Hello,

Quoted 11 lines · Fabrice Fontaine

cc-tool depends on signals2 not signals, indeed only signals2 is used in src/data/progress_watcher.h and BOOST_SIGNALS defined in m4/boost.m4 is never used in configure.ac

No BR2_PACKAGE_SIGNALS2 is needed as signals2 is a header-only boost library

---
Changes v1 -> v2 (after review of Thomas Petazzoni):
- Give more details in commit log

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#4 lore raw

PATCH v2 1/2 cc-tool: drop BR2_PACKAGE_BOOST_SIGNALS select

In reply to Fabrice Fontaine
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabrice" == Fabrice Fontaine <[email protected]> writes:

cc-tool depends on signals2 not signals, indeed only signals2 is used in src/data/progress_watcher.h and BOOST_SIGNALS defined in m4/boost.m4 is never used in configure.ac

Quoted 7 lines

No BR2_PACKAGE_SIGNALS2 is needed as signals2 is a header-only boost library

---
Changes v1 -> v2 (after review of Thomas Petazzoni):
- Give more details in commit log

Committed to 2018.02.x and 2018.11.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard