boost: bump to 1.65.1

PATCH New Adam Duskett 5 participants 8 messages Oct 17, 2017 – Oct 21, 2017

Share & tools

Adam Duskett

author

2017-10-17 20:44 UTC #0 lore raw

PATCH 1/1 boost: bump to 1.65.1

Other changes:
- The coroutine2 library has been removed. As such it has been removed from the boost.mk file, the boost Config.in file, and a new entry has been added to Config.in.legacy explaining that it has been removed.

- Add LICENSE_1_0.txt sha256sum to boost.hash

Signed-off-by Adam Duskett <[email protected]>

---
 Config.in.legacy         | 6 ++++++
 package/boost/Config.in  | 4 ----
 package/boost/boost.hash | 7 +++++--
 package/boost/boost.mk   | 9 ++++-----
 4 files changed, 15 insertions(+), 11 deletions(-)

Config.in.legacy +6 -0

index 748876880c..9c2fe84def 100644
@@ -145,6 +145,12 @@ endif
 ###############################################################################
 comment "Legacy options removed in 2017.11"
 
+config BR2_PACKAGE_BOOST_COROUTINE2
+	bool "boost coroutine2 option removed"
+	select BR2_LEGACY
+	help
+	  Boost 1.65.1 no longer offers the coroutine2 library.
+
 config BR2_PACKAGE_OPENOBEX_BLUEZ
 	bool "openobex bluez option removed"
 	select BR2_LEGACY

package/boost/Config.in +0 -4

index 50d0ff8e01..3b3c89b8c1 100644
@@ -73,10 +73,6 @@ config BR2_PACKAGE_BOOST_COROUTINE
 	bool "boost-coroutine"
 	depends on BR2_PACKAGE_BOOST_CONTEXT
 
-config BR2_PACKAGE_BOOST_COROUTINE2
-	bool "boost-coroutine2"
-	depends on BR2_PACKAGE_BOOST_CONTEXT
-
 config BR2_PACKAGE_BOOST_DATE_TIME
 	bool "boost-date_time"

package/boost/boost.hash +5 -2

index 7494c0cb26..6e40c0d3b4 100644
@@ -1,2 +1,5 @@
-# From http://www.boost.org/users/history/version_1_64_0.html
-sha256 7bcc5caace97baa948931d712ea5f37038dbb1c5d89b43ad4def4ed7cb683332  boost_1_64_0.tar.bz2
+# From http://www.boost.org/users/history/version_1_65_1.html
+sha256 9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81  boost_1_65_1.tar.bz2
+
+# Locally computed
+sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566  LICENSE_1_0.txt

package/boost/boost.mk +4 -5

index e515faf1f9..8ba88a7b7c 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-BOOST_VERSION = 1.64.0
+BOOST_VERSION = 1.65.1
 BOOST_SOURCE = boost_$(subst .,_,$(BOOST_VERSION)).tar.bz2
 BOOST_SITE = http://downloads.sourceforge.net/project/boost/boost/$(BOOST_VERSION)
 BOOST_INSTALL_STAGING = YES

@@ -14,9 +14,9 @@ BOOST_LICENSE_FILES = LICENSE_1_0.txt
 # keep host variant as minimal as possible
 HOST_BOOST_FLAGS = --without-icu \
 	--without-libraries=$(subst $(space),$(comma),atomic chrono context \
-	coroutine coroutine2 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 \
+	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)
 
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_ATOMIC),,atomic)

@@ -24,7 +24,6 @@ BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CHRONO),,chrono)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CONTAINER),,container)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CONTEXT),,context)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_COROUTINE),,coroutine)
-BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_COROUTINE2),,coroutine2)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_DATE_TIME),,date_time)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_EXCEPTION),,exception)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_FILESYSTEM),,filesystem)

Signature · 1 line

2.13.6

Jörg Krause

2017-10-18 18:48 UTC #1 lore raw

PATCH 1/1 boost: bump to 1.65.1

Hi Adam,

Quoted 86 lines · Adam Duskett

- Add LICENSE_1_0.txt sha256sum to boost.hash

Signed-off-by Adam Duskett <[email protected]>

---
 Config.in.legacy         | 6 ++++++
 package/boost/Config.in  | 4 ----
 package/boost/boost.hash | 7 +++++--
 package/boost/boost.mk   | 9 ++++-----
 4 files changed, 15 insertions(+), 11 deletions(-)

Config.in.legacy +6 -0

index 748876880c..9c2fe84def 100644
@@ -145,6 +145,12 @@ endif
 ###############################################################################
 comment "Legacy options removed in 2017.11"
 
+config BR2_PACKAGE_BOOST_COROUTINE2
+	bool "boost coroutine2 option removed"
+	select BR2_LEGACY
+	help
+	  Boost 1.65.1 no longer offers the coroutine2 library.
+
 config BR2_PACKAGE_OPENOBEX_BLUEZ
 	bool "openobex bluez option removed"
 	select BR2_LEGACY

package/boost/Config.in +0 -4

index 50d0ff8e01..3b3c89b8c1 100644
@@ -73,10 +73,6 @@ config BR2_PACKAGE_BOOST_COROUTINE
 	bool "boost-coroutine"
 	depends on BR2_PACKAGE_BOOST_CONTEXT
 
-config BR2_PACKAGE_BOOST_COROUTINE2
-	bool "boost-coroutine2"
-	depends on BR2_PACKAGE_BOOST_CONTEXT
-
 config BR2_PACKAGE_BOOST_DATE_TIME
 	bool "boost-date_time"

package/boost/boost.hash +5 -2

index 7494c0cb26..6e40c0d3b4 100644
@@ -1,2 +1,5 @@
-# From http://www.boost.org/users/history/version_1_64_0.html
-sha256 7bcc5caace97baa948931d712ea5f37038dbb1c5d89b43ad4def4ed7cb683332  boost_1_64_0.tar.bz2
+# From http://www.boost.org/users/history/version_1_65_1.html
+sha256 9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81  boost_1_65_1.tar.bz2
+
+# Locally computed
+sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566  LICENSE_1_0.txt

package/boost/boost.mk +4 -4

index e515faf1f9..8ba88a7b7c 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-BOOST_VERSION = 1.64.0
+BOOST_VERSION = 1.65.1
 BOOST_SOURCE = boost_$(subst .,_,$(BOOST_VERSION)).tar.bz2
 BOOST_SITE = http://downloads.sourceforge.net/project/boost/boost/$(BOOST_VERSION)
 BOOST_INSTALL_STAGING = YES

@@ -14,9 +14,9 @@ BOOST_LICENSE_FILES = LICENSE_1_0.txt
 # keep host variant as minimal as possible
 HOST_BOOST_FLAGS = --without-icu \
 	--without-libraries=$(subst $(space),$(comma),atomic chrono context \
-	coroutine coroutine2 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 \
+	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)
 
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_ATOMIC),,atomic)

package/boost/boost.mk BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CHRONO),,chrono) · line 29

Quoted 7 lines

package/boost/boost.mk +0 -1

@@ -24,7 +24,6 @@ BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CHRONO),,chrono)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CONTAINER),,container)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CONTEXT),,context)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_COROUTINE),,coroutine)
-BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_COROUTINE2),,coroutine2)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_DATE_TIME),,date_time)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_EXCEPTION),,exception)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_FILESYSTEM),,filesystem)

Did you tried to build boost (especially the fiber module) with a musl- toolchain? There is a build issue reported upstream [1]. However, it turned out that the issue was not caused by boost, but by musl itself. Meanwhile, the issue has been fixed in musl [2].

In my opinion it would be best to simple apply the workaround proposed in [1] to allow building boost-fiber with musl.

[1] https://github.com/boostorg/fiber/pull/142
[2] https://git.musl-libc.org/cgit/musl/commit/?id=48be5b6313d7b827acf5
55769e93b389fa9f6307

Best regards,
J?rg Krause

Henrique Marks

2017-10-19 16:18 UTC #2 lore raw

PATCH 1/1 boost: bump to 1.65.1

Hello

Quoted 9 lines · Adam Duskett

Quoted 7 lines
Other changes:
- The coroutine2 library has been removed. As such it has been removed from the boost.mk file, the boost Config.in file, and a new entry has been added to Config.in.legacy explaining that it has been removed.
- Add LICENSE_1_0.txt sha256sum to boost.hash

Quoted 8 lines

Signed-off-by Adam Duskett <[email protected]>

---
 Config.in.legacy         | 6 ++++++
 package/boost/Config.in  | 4 ----
 package/boost/boost.hash | 7 +++++--
 package/boost/boost.mk   | 9 ++++-----
 4 files changed, 15 insertions(+), 11 deletions(-)

I think this is just wrong, according to boost release notes:

http://www.boost.org/doc/libs/1_65_1/

* This is coroutine, the original one, now deprecated *

Coroutine (deprecated)
Coroutine library.

Author(s)
Oliver Kowalke
First Release
1.53.0
Standard

* This is coroutine2, the new one *

Coroutine2
(C++11) Coroutine library.

Author(s)
Oliver Kowalke
First Release
1.59.0
Standard

I can't find the information coroutine2 has been removed from the release notes.

Please double check this, we use these package :-)

Signature · 5 lines

Dr. Henrique Marks
henrique.marks at datacom.ind.br
R. Am?rica, 1000 - Eldorado do Sul - RS
CEP: 92990-000 - Brasil
Fone: +55 51 3933 3000 - Ramal 3466

Adam Duskett

author

2017-10-19 19:49 UTC #3 lore raw

PATCH 1/1 boost: bump to 1.65.1

Hi Henrique;

Quoted 47 lines · Henrique Marks

Hello
Quoted 9 lines · Adam Duskett
Quoted 7 lines
Other changes:
- The coroutine2 library has been removed. As such it has been removed from the boost.mk file, the boost Config.in file, and a new entry has been added to Config.in.legacy explaining that it has been removed.
- Add LICENSE_1_0.txt sha256sum to boost.hash
Quoted 8 lines
Quoted 8 lines
Signed-off-by Adam Duskett <[email protected]>
---
 Config.in.legacy         | 6 ++++++
 package/boost/Config.in  | 4 ----
 package/boost/boost.hash | 7 +++++--
 package/boost/boost.mk   | 9 ++++-----
 4 files changed, 15 insertions(+), 11 deletions(-)
I think this is just wrong, according to boost release notes:
http://www.boost.org/doc/libs/1_65_1/
* This is coroutine, the original one, now deprecated *
Coroutine (deprecated)
Coroutine library.
Author(s)
Oliver Kowalke
First Release
1.53.0
Standard
* This is coroutine2, the new one *
Coroutine2
(C++11) Coroutine library.
Author(s)
Oliver Kowalke
First Release
1.59.0
Standard

Quoted 4 lines

I can't find the information coroutine2 has been removed from the release notes.
Please double check this, we use these package :-)

If you download the latest boost, and check the libs/coroutine2 folder, there is no longer a src directory.
Trying to build with "--without-libraries=coroutine2" results in the error:
"error: wrong library name 'coroutine2' in the --without-<library> option."

It seems to have been effectively removed!

Quoted 10 lines

--
Dr. Henrique Marks
henrique.marks at datacom.ind.br
R. Am?rica, 1000 - Eldorado do Sul - RS
CEP: 92990-000 - Brasil
Fone: +55 51 3933 3000 - Ramal 3466
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Adam

Henrique Marks

2017-10-20 15:57 UTC #4 lore raw

PATCH 1/1 boost: bump to 1.65.1

Hello Adam

Quoted 7 lines

If you download the latest boost, and check the libs/coroutine2 folder, there is no longer a src directory.
Trying to build with "--without-libraries=coroutine2" results in the error:
"error: wrong library name 'coroutine2' in the --without-<library> option."
It seems to have been effectively removed!

Thanks for checking this again.

I will have to take a look at this, but this flag "without-libraries" seems strange.

I think it is better to wait for this integration a bit.

Thanks again

Signature · 5 lines

Dr. Henrique Marks
henrique.marks at datacom.ind.br
R. Am?rica, 1000 - Eldorado do Sul - RS
CEP: 92990-000 - Brasil
Fone: +55 51 3933 3000 - Ramal 3466

Bernd Kuhls

2017-10-20 16:23 UTC #5 lore raw

PATCH 1/1 boost: bump to 1.65.1

In reply to Adam Duskett

Am Thu, 19 Oct 2017 15:49:23 -0400 schrieb Adam Duskett:

Quoted 10 lines

Quoted 4 lines
I can't find the information coroutine2 has been removed from the release notes.
Please double check this, we use these package :-)
If you download the latest boost, and check the libs/coroutine2 folder, there is no longer a src directory.
Trying to build with "--without-libraries=coroutine2" results in the error:
"error: wrong library name 'coroutine2' in the --without-<library> option."
It seems to have been effectively removed!

Hi,

yes, it was removed as a binary lib and converted into a header-only lib:
https://github.com/boostorg/coroutine2/commit/5b06384117d19b8ce8b52678fe7f62d9f1354155

Regards, Bernd

Henrique Marks

2017-10-20 17:15 UTC #6 lore raw

PATCH 1/1 boost: bump to 1.65.1

Quoted 8 lines

Hi,
yes, it was removed as a binary lib and converted into a header-only lib:
https://github.com/boostorg/coroutine2/commit/5b06384117d19b8ce8b52678fe7f62d9f1354155
Regards, Bernd

I have tested it and the module that depends on coroutine2 works in boost 1.65.1, exactly because of this.

But coroutine2 is there, as the release notes states.

Thanks

Signature · 5 lines

Dr. Henrique Marks
henrique.marks at datacom.ind.br
R. Am?rica, 1000 - Eldorado do Sul - RS
CEP: 92990-000 - Brasil
Fone: +55 51 3933 3000 - Ramal 3466

Thomas Petazzoni

2017-10-21 13:29 UTC #7 lore raw

PATCH 1/1 boost: bump to 1.65.1

In reply to Adam Duskett

Hello,

Quoted 7 lines · Adam Duskett

Other changes:
- The coroutine2 library has been removed. As such it has been removed from the boost.mk file, the boost Config.in file, and a new entry has been added to Config.in.legacy explaining that it has been removed.
- Add LICENSE_1_0.txt sha256sum to boost.hash

Quoted 7 lines

Signed-off-by Adam Duskett <[email protected]>

---
 Config.in.legacy         | 6 ++++++
 package/boost/Config.in  | 4 ----
 package/boost/boost.hash | 7 +++++--
 package/boost/boost.mk   | 9 ++++-----
 4 files changed, 15 insertions(+), 11 deletions(-)

Following the comments from the reviewers (thanks to them!), I've:

- Reworded the commit log to be correct about what happened to coroutine2

- Removed the Config.in.legacy handling: even though we're removing an option, coroutine2 support is now unconditionally present in Boost, so having legacy handling for this doesn't make much sense.

Applied with those changes. Thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com