mirror of
https://github.com/SerenityOS/serenity
synced 2024-07-01 11:39:22 +00:00
Ports/boost: Update boost to version 1.83.0
The `Boost.System` patch was removed, as it no longer applies.
This commit is contained in:
EWouters
Jelle Raaijmakers
parent
6a83163a61
commit
2ea65e512c
|
|
@ -22,7 +22,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n
|
|||
| [`binutils`](binutils/) | GNU Binutils | 2.41 | https://www.gnu.org/software/binutils/ |
|
||||
| [`bison`](bison/) | GNU Bison | 3.8 | https://www.gnu.org/software/bison/ |
|
||||
| [`bochs`](bochs/) | Bochs x86 PC emulator | 2.7 | https://sourceforge.net/projects/bochs/ |
|
||||
| [`boost`](boost/) | Boost C++ libraries | 1.80.0 | https://www.boost.org/ |
|
||||
| [`boost`](boost/) | Boost C++ libraries | 1.83.0 | https://www.boost.org/ |
|
||||
| [`brogue`](brogue/) | BrogueCE | 1.12 | https://github.com/tmewett/BrogueCE |
|
||||
| [`brotli`](brotli/) | Brotli | 1.1.0 | https://github.com/google/brotli |
|
||||
| [`byacc`](byacc/) | Berkeley Yacc | 20220128 | https://invisible-island.net/byacc/byacc.html |
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/env -S bash ../.port_include.sh
|
||||
port='boost'
|
||||
version='1.80.0'
|
||||
version='1.83.0'
|
||||
useconfigure='true'
|
||||
workdir="boost_${version//./_}"
|
||||
depends=(
|
||||
|
|
@ -11,7 +11,7 @@ depends=(
|
|||
'libicu'
|
||||
)
|
||||
files=(
|
||||
"https://boostorg.jfrog.io/artifactory/main/release/${version}/source/boost_${version//./_}.tar.bz2#1e19565d82e43bc59209a168f5ac899d3ba471d55c7610c677d4ccf2c9c500c0"
|
||||
"https://boostorg.jfrog.io/artifactory/main/release/${version}/source/boost_${version//./_}.tar.bz2#6478edfe2f3305127cffe8caf73ea0176c53769f4bf1585be237eb30798c3b8e"
|
||||
)
|
||||
bjamopts=(
|
||||
'--user-config=user-config.jam'
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ index ced1fc1ff803383138e755efebef95983b85e0bd..5e0fc3998b86313a873a0549c95394e7
|
|||
Specifies the operating system for which the code is to be generated. The
|
||||
compiler you used should be the compiler for that operating system. This option
|
||||
diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam
|
||||
index 7265553692172482a77407c715c905d4b880a1ca..58feebab4f78153095bdc097918c60a3a0655c01 100644
|
||||
index 834f5e1bf6ddb080127a9e17e566571a39b8fef3..9e18425d018866a0590e5205258ba4b2b099f6ec 100644
|
||||
--- a/tools/build/src/tools/gcc.jam
|
||||
+++ b/tools/build/src/tools/gcc.jam
|
||||
@@ -203,6 +203,7 @@ rule init ( version ? : command * : options * : requirement * )
|
||||
|
|
@ -101,15 +101,15 @@ index 7265553692172482a77407c715c905d4b880a1ca..58feebab4f78153095bdc097918c60a3
|
|||
# TODO: finish this list.
|
||||
}
|
||||
}
|
||||
@@ -389,6 +390,7 @@ local rule compile-link-flags ( * )
|
||||
threading-flags <target-os>cygwin : -mthreads ;
|
||||
@@ -391,6 +392,7 @@ local rule compile-link-flags ( * )
|
||||
threading-flags <target-os>cygwin/<threadapi>pthread : -pthread ;
|
||||
threading-flags <target-os>solaris : -pthreads : rt ;
|
||||
threading-flags <target-os>qnx : -pthread ;
|
||||
+ threading-flags <target-os>serenity ;
|
||||
|
||||
local bsd = [ MATCH ^(.*bsd)$ : $(all-os) ] ;
|
||||
threading-flags <target-os>$(bsd) : -pthread ;
|
||||
@@ -396,7 +398,7 @@ local rule compile-link-flags ( * )
|
||||
@@ -398,7 +400,7 @@ local rule compile-link-flags ( * )
|
||||
# iOS doesn't need pthread flag according to the https://developer.apple.com/library/archive/documentation/System/Conceptual/ManPages_iPhoneOS/man3/pthread.3.html
|
||||
# The default system libraries include pthread functions. No additional libraries or CFLAGS are necessary to use this API.
|
||||
local no-threading = android beos haiku sgi darwin vxworks iphone appletv ;
|
||||
|
|
|
|||
|
|
@ -1,63 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Gunnar Beutner <gunnar@beutner.name>
|
||||
Date: Sun, 23 Oct 2022 12:05:20 +0200
|
||||
Subject: [PATCH] Fix building Boost.System
|
||||
|
||||
---
|
||||
boost/system/detail/config.hpp | 2 +-
|
||||
boost/system/detail/error_category_impl.hpp | 6 ++++++
|
||||
2 files changed, 7 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/boost/system/detail/config.hpp b/boost/system/detail/config.hpp
|
||||
index ad958bcabe2fa05c5242ff11dfcc07004885d86a..26e0a4cae88cb0f80c0532308b92446a04ddf243 100644
|
||||
--- a/boost/system/detail/config.hpp
|
||||
+++ b/boost/system/detail/config.hpp
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
// BOOST_SYSTEM_HAS_SYSTEM_ERROR
|
||||
|
||||
-#if !defined(BOOST_NO_CXX11_HDR_SYSTEM_ERROR) && !defined(BOOST_NO_CXX11_HDR_ATOMIC) && !defined(BOOST_NO_CXX11_HDR_MUTEX)
|
||||
+#if !defined(BOOST_NO_CXX11_HDR_SYSTEM_ERROR) && !defined(BOOST_NO_CXX11_HDR_ATOMIC)
|
||||
# define BOOST_SYSTEM_HAS_SYSTEM_ERROR
|
||||
#endif
|
||||
|
||||
diff --git a/boost/system/detail/error_category_impl.hpp b/boost/system/detail/error_category_impl.hpp
|
||||
index 982c667b3f0b8960aa6e3ecaf1dc15eb01e06436..0335f3504c77b5ea27f8df0d3ba7011389d13e33 100644
|
||||
--- a/boost/system/detail/error_category_impl.hpp
|
||||
+++ b/boost/system/detail/error_category_impl.hpp
|
||||
@@ -98,7 +98,9 @@ inline char const * error_category::message( int ev, char * buffer, std::size_t
|
||||
#if defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
|
||||
|
||||
#include <boost/system/detail/std_category_impl.hpp>
|
||||
+#ifndef BOOST_NO_CXX11_HDR_MUTEX
|
||||
#include <mutex>
|
||||
+#endif
|
||||
#include <new>
|
||||
|
||||
namespace boost
|
||||
@@ -106,6 +108,7 @@ namespace boost
|
||||
namespace system
|
||||
{
|
||||
|
||||
+#ifndef BOOST_NO_CXX11_HDR_MUTEX
|
||||
namespace detail
|
||||
{
|
||||
|
||||
@@ -117,6 +120,7 @@ template<class = void> struct stdcat_mx_holder
|
||||
template<class T> std::mutex stdcat_mx_holder<T>::mx_;
|
||||
|
||||
} // namespace detail
|
||||
+#endif
|
||||
|
||||
inline void error_category::init_stdcat() const
|
||||
{
|
||||
@@ -130,7 +134,9 @@ inline void error_category::init_stdcat() const
|
||||
|
||||
#endif
|
||||
|
||||
+#ifndef BOOST_NO_CXX11_HDR_MUTEX
|
||||
std::lock_guard<std::mutex> lk( boost::system::detail::stdcat_mx_holder<>::mx_ );
|
||||
+#endif
|
||||
|
||||
if( sc_init_.load( std::memory_order_acquire ) == 0 )
|
||||
{
|
||||
|
|
@ -15,8 +15,3 @@ Fix building Boost.Interprocess
|
|||
Fix building Boost.Python
|
||||
|
||||
|
||||
## `0004-Fix-building-Boost.System.patch`
|
||||
|
||||
Fix building Boost.System
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user