From a3c6d8badc02abecb3ba951145533b437f59b05f Mon Sep 17 00:00:00 2001 From: Carlos Miguel Ferreira Date: Mon, 14 Dec 2020 00:10:59 +0000 Subject: [PATCH] boost: Removes unecessary patch Fixed in upstream Signed-off-by: Carlos Miguel Ferreira --- libs/boost/patches/001-uclibc-asio.patch | 68 ------------------------ 1 file changed, 68 deletions(-) delete mode 100644 libs/boost/patches/001-uclibc-asio.patch diff --git a/libs/boost/patches/001-uclibc-asio.patch b/libs/boost/patches/001-uclibc-asio.patch deleted file mode 100644 index b32ad93998..0000000000 --- a/libs/boost/patches/001-uclibc-asio.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 95d82acc57bb7d8bae431f7a6ce0707aac3ef33f Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Thu, 5 Sep 2019 19:41:13 -0700 -Subject: [PATCH] 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 -Signed-off-by: Rosen Penev ---- - a/boost/asio/detail/impl/eventfd_select_interrupter.ipp | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/boost/asio/detail/impl/eventfd_select_interrupter.ipp b/boost/asio/detail/impl/eventfd_select_interrupter.ipp -index 38d4b2a61..e16cc8b00 100644 ---- a/boost/asio/detail/impl/eventfd_select_interrupter.ipp -+++ b/boost/asio/detail/impl/eventfd_select_interrupter.ipp -@@ -23,11 +23,11 @@ - #include - #include - #include --#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 8 && !defined(__UCLIBC__) -+#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 2 && !defined(__UCLIBC__) - # include --#else // __GLIBC__ == 2 && __GLIBC_MINOR__ < 8 && !defined(__UCLIBC__) -+#else // __GLIBC__ == 2 && __GLIBC_MINOR__ < 2 && !defined(__UCLIBC__) - # include --#endif // __GLIBC__ == 2 && __GLIBC_MINOR__ < 8 && !defined(__UCLIBC__) -+#endif // __GLIBC__ == 2 && __GLIBC_MINOR__ < 2 && !defined(__UCLIBC__) - #include - #include - #include -@@ -46,14 +46,14 @@ eventfd_select_interrupter::eventfd_select_interrupter() - - void eventfd_select_interrupter::open_descriptors() - { --#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 8 && !defined(__UCLIBC__) -+#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 2 && !defined(__UCLIBC__) - write_descriptor_ = read_descriptor_ = syscall(__NR_eventfd, 0); - if (read_descriptor_ != -1) - { - ::fcntl(read_descriptor_, F_SETFL, O_NONBLOCK); - ::fcntl(read_descriptor_, F_SETFD, FD_CLOEXEC); - } --#else // __GLIBC__ == 2 && __GLIBC_MINOR__ < 8 && !defined(__UCLIBC__) -+#else // __GLIBC__ == 2 && __GLIBC_MINOR__ < 2 && !defined(__UCLIBC__) - # if defined(EFD_CLOEXEC) && defined(EFD_NONBLOCK) - write_descriptor_ = read_descriptor_ = - ::eventfd(0, EFD_CLOEXEC | EFD_NONBLOCK); -@@ -70,7 +70,7 @@ void eventfd_select_interrupter::open_descriptors() - ::fcntl(read_descriptor_, F_SETFD, FD_CLOEXEC); - } - } --#endif // __GLIBC__ == 2 && __GLIBC_MINOR__ < 8 && !defined(__UCLIBC__) -+#endif // __GLIBC__ == 2 && __GLIBC_MINOR__ < 2 && !defined(__UCLIBC__) - - if (read_descriptor_ == -1) - { -- 2.30.2