From: Jörg Krause Date: Fri, 11 Dec 2015 13:57:57 +0000 (+0100) Subject: package/boost: bump to version 1.59.0 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=12ec0cd9af0a9754d97fafddef3c281e95ebe59a;p=buildroot.git package/boost: bump to version 1.59.0 Also: * remove patch "gcc.jam compiler options fix" - merged upstream * renumber patch "fix uclibc eventfd". Signed-off-by: Jörg Krause Reviewed-by: Vicente Olivert Riera Tested-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- diff --git a/package/boost/0002-fix-uclibc-eventfd.patch b/package/boost/0002-fix-uclibc-eventfd.patch new file mode 100644 index 0000000000..1b7eb8723c --- /dev/null +++ b/package/boost/0002-fix-uclibc-eventfd.patch @@ -0,0 +1,38 @@ +Use eventfd() function with uClibc + +The Boost eventfd code either directly makes the eventfd system call +using __NR_eventfd (when __GLIBC_MINOR is less than 8), or otherwise +uses the eventfd() function provided by the C library. + +However, since uClibc pretends to be glibc 2.2, the Boost eventfd code +directly uses the system call. While it works fine on most +architectures, it doesn't on ARC since __NR_eventfd is not defined on +this architecture. However, eventfd() is properly implemented. + +So, this patch adjusts the logic used by Boost to consider uClibc as a +C library providing the eventfd() function. + +Signed-off-by: Thomas Petazzoni + +Index: b/boost/asio/detail/impl/eventfd_select_interrupter.ipp +=================================================================== +--- a/boost/asio/detail/impl/eventfd_select_interrupter.ipp ++++ b/boost/asio/detail/impl/eventfd_select_interrupter.ipp +@@ -23,7 +23,7 @@ + #include + #include + #include +-#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 8 ++#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 8 && !defined(__UCLIBC__) + # include + #else // __GLIBC__ == 2 && __GLIBC_MINOR__ < 8 + # include +@@ -46,7 +46,7 @@ + + void eventfd_select_interrupter::open_descriptors() + { +-#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 8 ++#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 8 && !defined(__UCLIBC__) + write_descriptor_ = read_descriptor_ = syscall(__NR_eventfd, 0); + if (read_descriptor_ != -1) + { diff --git a/package/boost/0002-gcc.jam-compiler-options-fix.patch b/package/boost/0002-gcc.jam-compiler-options-fix.patch deleted file mode 100644 index c64525000f..0000000000 --- a/package/boost/0002-gcc.jam-compiler-options-fix.patch +++ /dev/null @@ -1,37 +0,0 @@ -From a891e48ed0b647b7bf550ad1d179398b23d0726e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Sat, 2 May 2015 13:47:54 +0200 -Subject: [PATCH] gcc.jam compiler options fix -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Only PowerPC, SPARC, and x86 do support the -m32 and -m64 compiler options [1]. - -Rather then excluding all architectures not supporting these options as it is -done in commit c0634341d9ee2c02d3a55c91dafb988afc066c49 [2], include all -architectures that do support them. - -[1] https://gcc.gnu.org/onlinedocs/gcc/Option-Summary.html -[2] https://github.com/boostorg/build/commit/c0634341d9ee2c02d3a55c91dafb988afc066c49 - -Signed-off-by: Jörg Krause ---- - src/tools/gcc.jam | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam -index db04534..fbe8ab0 100644 ---- a/tools/build/src/tools/gcc.jam -+++ b/tools/build/src/tools/gcc.jam -@@ -451,7 +451,7 @@ rule setup-address-model ( targets * : sources * : properties * ) - else - { - local arch = [ feature.get-values architecture : $(properties) ] ; -- if $(arch) != arm -+ if $(arch) = power || $(arch) = sparc || $(arch) = x86 - { - if $(model) = 32 - { --- -2.3.7 diff --git a/package/boost/0004-fix-uclibc-eventfd.patch b/package/boost/0004-fix-uclibc-eventfd.patch deleted file mode 100644 index 1b7eb8723c..0000000000 --- a/package/boost/0004-fix-uclibc-eventfd.patch +++ /dev/null @@ -1,38 +0,0 @@ -Use eventfd() function with uClibc - -The Boost eventfd code either directly makes the eventfd system call -using __NR_eventfd (when __GLIBC_MINOR is less than 8), or otherwise -uses the eventfd() function provided by the C library. - -However, since uClibc pretends to be glibc 2.2, the Boost eventfd code -directly uses the system call. While it works fine on most -architectures, it doesn't on ARC since __NR_eventfd is not defined on -this architecture. However, eventfd() is properly implemented. - -So, this patch adjusts the logic used by Boost to consider uClibc as a -C library providing the eventfd() function. - -Signed-off-by: Thomas Petazzoni - -Index: b/boost/asio/detail/impl/eventfd_select_interrupter.ipp -=================================================================== ---- a/boost/asio/detail/impl/eventfd_select_interrupter.ipp -+++ b/boost/asio/detail/impl/eventfd_select_interrupter.ipp -@@ -23,7 +23,7 @@ - #include - #include - #include --#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 8 -+#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 8 && !defined(__UCLIBC__) - # include - #else // __GLIBC__ == 2 && __GLIBC_MINOR__ < 8 - # include -@@ -46,7 +46,7 @@ - - void eventfd_select_interrupter::open_descriptors() - { --#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 8 -+#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 8 && !defined(__UCLIBC__) - write_descriptor_ = read_descriptor_ = syscall(__NR_eventfd, 0); - if (read_descriptor_ != -1) - { diff --git a/package/boost/boost.hash b/package/boost/boost.hash index 706eea276e..356242bfa5 100644 --- a/package/boost/boost.hash +++ b/package/boost/boost.hash @@ -1,3 +1,3 @@ -# From http://sourceforge.net/projects/boost/files/boost/1.58.0/ -md5 b8839650e61e9c1c0a89f371dd475546 boost_1_58_0.tar.bz2 -sha1 2fc96c1651ac6fe9859b678b165bd78dc211e881 boost_1_58_0.tar.bz2 +# From http://sourceforge.net/projects/boost/files/boost/1.59.0/ +md5 6aa9a5c6a4ca1016edd0ed1178e3cb87 boost_1_59_0.tar.bz2 +sha1 b94de47108b2cdb0f931833a7a9834c2dd3ca46e boost_1_59_0.tar.bz2 diff --git a/package/boost/boost.mk b/package/boost/boost.mk index 6a2e925cb3..2f23fe1b9b 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -4,7 +4,7 @@ # ################################################################################ -BOOST_VERSION = 1.58.0 +BOOST_VERSION = 1.59.0 BOOST_SOURCE = boost_$(subst .,_,$(BOOST_VERSION)).tar.bz2 BOOST_SITE = http://downloads.sourceforge.net/project/boost/boost/$(BOOST_VERSION) BOOST_INSTALL_STAGING = YES