diff --git a/dev-libs/boost/boost169-1.69.0.recipe b/dev-libs/boost/boost169-1.69.0.recipe index 607cdd33e..8d6456342 100644 --- a/dev-libs/boost/boost169-1.69.0.recipe +++ b/dev-libs/boost/boost169-1.69.0.recipe @@ -4,7 +4,7 @@ that provide support for tasks and structures such as linear algebra, \ pseudorandom number generation, multithreading, image processing, regular \ expressions, and unit testing. It contains over eighty individual libraries." HOMEPAGE="https://www.boost.org/" -SOURCE_URI="https://dl.bintray.com/boostorg/release/$portVersion/source/boost_${portVersion//./_}.tar.bz2" +SOURCE_URI="https://boostorg.jfrog.io/artifactory/main/release/$portVersion/source/boost_${portVersion//./_}.tar.bz2" CHECKSUM_SHA256="8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406" REVISION="3" LICENSE="Boost v1.0" @@ -173,7 +173,7 @@ BUILD() inlining=on \ threading=multi \ variant=release \ - link=static,shared \ + link=shared \ runtime-link=shared \ --without-python } @@ -188,11 +188,13 @@ INSTALL() inlining=on \ threading=multi \ variant=release \ - link=static,shared \ + link=shared \ runtime-link=shared \ --without-python \ install + rm $libDir/libboost_{chrono,timer,system}.a + prepareInstalledDevelLibs `echo "$devel_libs" | sed -n \ -e "s/devel:\(.*\)$secondaryArchSuffix =.*/\1/p"` diff --git a/dev-libs/boost/boost170-1.70.0.recipe b/dev-libs/boost/boost170-1.70.0.recipe index a7d61c840..88ce06269 100644 --- a/dev-libs/boost/boost170-1.70.0.recipe +++ b/dev-libs/boost/boost170-1.70.0.recipe @@ -4,7 +4,7 @@ that provide support for tasks and structures such as linear algebra, \ pseudorandom number generation, multithreading, image processing, regular \ expressions, and unit testing. It contains over eighty individual libraries." HOMEPAGE="https://www.boost.org/" -SOURCE_URI="https://dl.bintray.com/boostorg/release/$portVersion/source/boost_${portVersion//./_}.tar.bz2" +SOURCE_URI="https://boostorg.jfrog.io/artifactory/main/release/$portVersion/source/boost_${portVersion//./_}.tar.bz2" CHECKSUM_SHA256="430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778" REVISION="4" LICENSE="Boost v1.0" @@ -176,7 +176,7 @@ BUILD() inlining=on \ threading=multi \ variant=release \ - link=static,shared \ + link=shared \ runtime-link=shared \ --without-python } @@ -191,7 +191,7 @@ INSTALL() inlining=on \ threading=multi \ variant=release \ - link=static,shared \ + link=shared \ runtime-link=shared \ --without-python \ install diff --git a/dev-libs/boost/patches/boost-1.69.0.patchset b/dev-libs/boost/patches/boost-1.69.0.patchset index f59f8c783..028eddc70 100644 --- a/dev-libs/boost/patches/boost-1.69.0.patchset +++ b/dev-libs/boost/patches/boost-1.69.0.patchset @@ -1,4 +1,4 @@ -From 6a182df59f170bec3ef36241d2fa0f6ee2f184dd Mon Sep 17 00:00:00 2001 +From e10b6bb16e7d25d492f09fbb43f57de85b7a20f4 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 6 Aug 2016 22:27:19 +0200 Subject: Import changes from 1.55.0: buildtools @@ -107,10 +107,10 @@ index 1a80c3f..031c014 100644 vms windows """.split() -- -2.19.1 +2.37.3 -From ae4d6bcda7b7fdeab901a082d05831743ebb24f6 Mon Sep 17 00:00:00 2001 +From d8ffb6aee3869581eb61ddaeeb7543991f4e4d26 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 6 Aug 2016 22:27:41 +0200 Subject: Import changes from 1.55.0: sourcecode @@ -130,10 +130,10 @@ index 172a601..c706e40 100644 #elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) # define BOOST_THREAD_MACOS -- -2.19.1 +2.37.3 -From 189b02716bd3de46d1bcb0150ada02ebb65b3038 Mon Sep 17 00:00:00 2001 +From c0316c623e8b59c0ba2287d37c296d987e2868c5 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 14 Oct 2017 11:47:09 +0200 Subject: Haiku needs bsd and _BSD_SOURCE. @@ -174,5 +174,35 @@ index 7e46e38..67293a0 100755 BOOST_JAM_CC=gcc esac -- -2.19.1 +2.37.3 + + +From 627d738436ec87c91b106837284ce378fbe8a46b Mon Sep 17 00:00:00 2001 +From: begasus +Date: Sun, 18 Dec 2022 08:16:06 +0100 +Subject: fix build, kudos to Jessicah and waddlesplash + + +diff --git a/libs/filesystem/src/operations.cpp b/libs/filesystem/src/operations.cpp +index 53dcdb7..f424785 100644 +--- a/libs/filesystem/src/operations.cpp ++++ b/libs/filesystem/src/operations.cpp +@@ -2112,8 +2112,13 @@ namespace + error_code ec = path_max(path_size); + if (ec)return ec; + dirent de; +- buffer = std::malloc((sizeof(dirent) - sizeof(de.d_name)) +- + path_size + 1); // + 1 for "/0" ++ #ifdef __HAIKU__ ++ buffer = std::malloc(sizeof(dirent) ++ + path_size + 1); ++ #else ++ buffer = std::malloc((sizeof(dirent) - sizeof(de.d_name)) ++ + path_size + 1); // + 1 for "/0" ++ #endif + return ok; + } + +-- +2.37.3 diff --git a/dev-libs/boost/patches/boost-1.70.0.patchset b/dev-libs/boost/patches/boost-1.70.0.patchset index 6210a93ce..cb0acf4d6 100644 --- a/dev-libs/boost/patches/boost-1.70.0.patchset +++ b/dev-libs/boost/patches/boost-1.70.0.patchset @@ -1,15 +1,8 @@ -From 07f5181a5923a4f35790917c8f28e22c495eea76 Mon Sep 17 00:00:00 2001 +From a572ebfbe6b8283ae653d99eb49fe3f993a819d9 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 6 Aug 2016 22:27:19 +0200 -Subject: [PATCH 1/4] Import changes from 1.55.0: buildtools +Subject: Import changes from 1.55.0: buildtools ---- - .../src/engine/boehm_gc/include/gc_config_macros.h | 2 +- - .../src/engine/boehm_gc/include/private/gcconfig.h | 13 +++++++++++++ - tools/build/src/engine/boehm_gc/os_dep.c | 11 ++++++++++- - tools/build/src/engine/jam.h | 5 +++++ - tools/build/src/tools/builtin.py | 2 +- - 5 files changed, 30 insertions(+), 3 deletions(-) diff --git a/tools/build/src/engine/boehm_gc/include/gc_config_macros.h b/tools/build/src/engine/boehm_gc/include/gc_config_macros.h index 762162a..723b4c3 100644 @@ -114,16 +107,14 @@ index 1a80c3f..031c014 100644 vms windows """.split() -- -2.30.0 +2.37.3 -From 41a0bab7b9799275513cc68470654b10b21bfbbd Mon Sep 17 00:00:00 2001 + +From 00e2d48c70237dbf34152c3995c2624c8fd5af05 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 6 Aug 2016 22:27:41 +0200 -Subject: [PATCH 2/4] Import changes from 1.55.0: sourcecode +Subject: Import changes from 1.55.0: sourcecode ---- - boost/thread/detail/platform.hpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boost/thread/detail/platform.hpp b/boost/thread/detail/platform.hpp index 172a601..c706e40 100644 @@ -139,17 +130,14 @@ index 172a601..c706e40 100644 #elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) # define BOOST_THREAD_MACOS -- -2.30.0 +2.37.3 -From 9e1a8d48ac5c077c944b74043ed769de54374822 Mon Sep 17 00:00:00 2001 + +From 0b4f7512e42c258995746e226dbe32dd42a6d78e Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 14 Oct 2017 11:47:09 +0200 -Subject: [PATCH 3/4] Haiku needs bsd and _BSD_SOURCE. +Subject: Haiku needs bsd and _BSD_SOURCE. ---- - tools/build/src/engine/build.jam | 5 +++++ - tools/build/src/engine/build.sh | 7 +++++++ - 2 files changed, 12 insertions(+) diff --git a/tools/build/src/engine/build.jam b/tools/build/src/engine/build.jam index de567dd..a66d791 100644 @@ -186,16 +174,14 @@ index 005e4d9..ac4f43f 100755 BOOST_JAM_CC=gcc esac -- -2.30.0 +2.37.3 -From 29c3ddc34fbed34972766a38e6e1530b002b83bb Mon Sep 17 00:00:00 2001 + +From c55a0516b3078f74f0d84dc1dddf584c3383f531 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Wed, 3 Feb 2021 08:36:01 -0600 -Subject: [PATCH 4/4] boost/beast: Fix macro seeing , as args on gcc8 +Subject: boost/beast: Fix macro seeing , as args on gcc8 ---- - boost/beast/core/impl/buffers_prefix.hpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boost/beast/core/impl/buffers_prefix.hpp b/boost/beast/core/impl/buffers_prefix.hpp index e4a484b..139dfb2 100644 @@ -214,5 +200,40 @@ index e4a484b..139dfb2 100644 using pointer = value_type const*; using reference = value_type; -- -2.30.0 +2.37.3 + + +From 7f61231378557712f15f1c79a96624c1976ea65f Mon Sep 17 00:00:00 2001 +From: begasus +Date: Sun, 18 Dec 2022 16:46:28 +0100 +Subject: Fix build, tip provided by Jessicah and waddlesplash + + +diff --git a/libs/filesystem/src/operations.cpp b/libs/filesystem/src/operations.cpp +index 91fe4d5..8b27cc6 100644 +--- a/libs/filesystem/src/operations.cpp ++++ b/libs/filesystem/src/operations.cpp +@@ -2186,12 +2186,17 @@ namespace + error_code ec = path_max(path_size); + if (ec) + return ec; +- const std::size_t buffer_size = (sizeof(dirent) - sizeof(dirent().d_name)) +- + path_size + 1; // + 1 for "\0" +- buffer = std::malloc(buffer_size); ++ #ifdef __HAIKU__ ++ buffer = std::malloc(sizeof(dirent) ++ + path_size + 1); ++ #else ++ const std::size_t buffer_size = (sizeof(dirent) - sizeof(dirent().d_name)) ++ + path_size + 1; // + 1 for "\0" ++ buffer = std::malloc(buffer_size); + if (BOOST_UNLIKELY(!buffer)) + return make_error_code(boost::system::errc::not_enough_memory); + std::memset(buffer, 0, buffer_size); ++ #endif + return ok; + } + +-- +2.37.3