diff --git a/meta/recipes-support/boost/boost-1.91.0.inc b/meta/recipes-support/boost/boost-1.92.0.inc similarity index 90% rename from meta/recipes-support/boost/boost-1.91.0.inc rename to meta/recipes-support/boost/boost-1.92.0.inc index dc68d7a336..98c2ec5aa2 100644 --- a/meta/recipes-support/boost/boost-1.91.0.inc +++ b/meta/recipes-support/boost/boost-1.92.0.inc @@ -12,7 +12,7 @@ BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}" BOOST_P = "boost_${BOOST_VER}" SRC_URI = "https://archives.boost.io/release/${PV}/source/${BOOST_P}.tar.bz2" -SRC_URI[sha256sum] = "de5e6b0e4913395c6bdfa90537febd9028ea4c0735d2cdb0cd9b45d5f51264f5" +SRC_URI[sha256sum] = "5c1d40cb8e19adbf740a4ec2da35b3e58f3f5804b1dce44deb53df72193cbc6c" UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/" UPSTREAM_CHECK_REGEX = "release/(?P.*)/source/" diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc index 7a343e54f6..6e9b1dc89c 100644 --- a/meta/recipes-support/boost/boost.inc +++ b/meta/recipes-support/boost/boost.inc @@ -200,6 +200,7 @@ do_compile() { do_install() { cd ${S} b2 ${BJAM_OPTS} \ + --prefix=${D}${prefix} \ --libdir=${D}${libdir} \ --includedir=${D}${includedir} \ install @@ -217,6 +218,9 @@ do_install() { grep 'cmake$' | \ xargs -n 1 sed -e 's,${D}${libdir}/cmake,${libdir}/cmake,' -i + # Remove boost_predef b2 check tooling - not needed for runtime or + # cross-compilation, and was never installed in previous versions + rm -rf ${D}${datadir} } BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch b/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch index 92bb6e55b3..672a41cf45 100644 --- a/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch +++ b/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch @@ -1,4 +1,4 @@ -From 98fff479c074472833dcacb815115f247e9023c7 Mon Sep 17 00:00:00 2001 +From d43269dab039cefe841c7fe9804d0cb6b5bbc393 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 18 Dec 2018 15:42:57 +0100 Subject: [PATCH] Don't set up arch/instruction-set flags, we do that @@ -13,7 +13,7 @@ Signed-off-by: Alexander Kanavin 1 file changed, 153 deletions(-) diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam -index acf02ce26..becd0ad05 100644 +index 5359b018d..ac313ce0d 100644 --- a/tools/build/src/tools/gcc.jam +++ b/tools/build/src/tools/gcc.jam @@ -1150,156 +1150,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + : diff --git a/meta/recipes-support/boost/boost/0001-dont-setup-compiler-flags-m32-m64.patch b/meta/recipes-support/boost/boost/0001-dont-setup-compiler-flags-m32-m64.patch index 229e5ab8ea..271220e589 100644 --- a/meta/recipes-support/boost/boost/0001-dont-setup-compiler-flags-m32-m64.patch +++ b/meta/recipes-support/boost/boost/0001-dont-setup-compiler-flags-m32-m64.patch @@ -1,4 +1,4 @@ -From 03ec6a66ad60d224d56c0b85eae843b469b572e0 Mon Sep 17 00:00:00 2001 +From c10c18b6d48304efd7e9d07fc46ab6db932f9694 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Thu, 14 Nov 2019 10:13:53 +0800 Subject: [PATCH] dont setup compiler flags -m32/-m64 @@ -13,7 +13,7 @@ Signed-off-by: Anuj Mittal 1 file changed, 16 deletions(-) diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam -index becd0ad05..e39bf8454 100644 +index ac313ce0d..9221f8615 100644 --- a/tools/build/src/tools/gcc.jam +++ b/tools/build/src/tools/gcc.jam @@ -375,22 +375,6 @@ local rule compile-link-flags ( * ) diff --git a/meta/recipes-support/boost/boost/0001-histogram-move-b2-project-requirements-out-of-build.patch b/meta/recipes-support/boost/boost/0001-histogram-move-b2-project-requirements-out-of-build.patch new file mode 100644 index 0000000000..ee3324f95b --- /dev/null +++ b/meta/recipes-support/boost/boost/0001-histogram-move-b2-project-requirements-out-of-build.patch @@ -0,0 +1,85 @@ +From 6f9d9d2c7c9736a8932460ee6c03244d55d24539 Mon Sep 17 00:00:00 2001 +From: Henry Schreiner +Date: Thu, 23 Jul 2026 10:12:17 -0400 +Subject: [PATCH] fix: move b2 project requirements out of build.jam + +hidden as a global project requirement leaks into the +install targets that boost-library generates and breaks alternative +selection when building the Boost superproject. The warning flags, +/bigobj, and hidden visibility only matter when compiling tests and +examples, so move them into test/Jamfile and examples/Jamfile. + +Fixes #425 + +Assisted-by: ClaudeCode:claude-fable-5 + +Upstream-Status: Backport [https://github.com/boostorg/histogram/commit/6f9d9d2c7c9736a8932460ee6c03244d55d24539] + +Signed-off-by: Jaipaul Cheernam +--- + libs/histogram/build.jam | 11 +---------- + libs/histogram/examples/Jamfile | 7 +++++++ + libs/histogram/test/Jamfile | 7 +++++++ + 3 files changed, 15 insertions(+), 10 deletions(-) + +diff --git a/libs/histogram/build.jam b/libs/histogram/build.jam +index 3adb8997..4aa62f46 100644 +--- a/libs/histogram/build.jam ++++ b/libs/histogram/build.jam +@@ -19,16 +19,7 @@ constant boost_dependencies : + /boost/throw_exception//boost_throw_exception + /boost/variant2//boost_variant2 ; + +-project /boost/histogram +- : requirements +- clang:"-Wsign-compare -Wstrict-aliasing -fstrict-aliasing -Wvexing-parse -Wfloat-conversion" +- gcc:"-Wsign-compare -Wstrict-aliasing -fstrict-aliasing -Wfloat-conversion" +- msvc:"/bigobj" +- intel-win:"/bigobj" +- hidden +- : default-build +- extra +- ; ++project /boost/histogram ; + + explicit + [ alias boost_histogram : : : +diff --git a/libs/histogram/examples/Jamfile b/libs/histogram/examples/Jamfile +index 655c0228..33b98d0f 100644 +--- a/libs/histogram/examples/Jamfile ++++ b/libs/histogram/examples/Jamfile +@@ -20,6 +20,13 @@ project + # list could go on... + ] + /boost/format//boost_format ++ clang:"-Wsign-compare -Wstrict-aliasing -fstrict-aliasing -Wvexing-parse -Wfloat-conversion" ++ gcc:"-Wsign-compare -Wstrict-aliasing -fstrict-aliasing -Wfloat-conversion" ++ msvc:"/bigobj" ++ intel-win:"/bigobj" ++ hidden ++ : default-build ++ extra + ; + + alias cxx14 : +diff --git a/libs/histogram/test/Jamfile b/libs/histogram/test/Jamfile +index f69299dc..c156e124 100644 +--- a/libs/histogram/test/Jamfile ++++ b/libs/histogram/test/Jamfile +@@ -30,6 +30,13 @@ project + cxx14_constexpr cxx14_decltype_auto cxx14_generic_lambdas cxx14_return_type_deduction cxx11_user_defined_literals + # list could go on... + ] ++ clang:"-Wsign-compare -Wstrict-aliasing -fstrict-aliasing -Wvexing-parse -Wfloat-conversion" ++ gcc:"-Wsign-compare -Wstrict-aliasing -fstrict-aliasing -Wfloat-conversion" ++ msvc:"/bigobj" ++ intel-win:"/bigobj" ++ hidden ++ : default-build ++ extra + ; + + # Check consistency of build systems +-- +2.34.1 + diff --git a/meta/recipes-support/boost/boost/boost-math-disable-pch-for-gcc.patch b/meta/recipes-support/boost/boost/boost-math-disable-pch-for-gcc.patch index 178c1dd416..eb6781f3b7 100644 --- a/meta/recipes-support/boost/boost/boost-math-disable-pch-for-gcc.patch +++ b/meta/recipes-support/boost/boost/boost-math-disable-pch-for-gcc.patch @@ -1,4 +1,4 @@ -From 2dd80802e0b9747ed32f45a886c7ad21b7fa61be Mon Sep 17 00:00:00 2001 +From 698ccf919d6facfbacdeeeceb7aeff1431d12316 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Fri, 23 Sep 2016 01:04:50 -0700 Subject: [PATCH] boost-math: disable pch for gcc diff --git a/meta/recipes-support/boost/boost_1.91.0.bb b/meta/recipes-support/boost/boost_1.92.0.bb similarity index 76% rename from meta/recipes-support/boost/boost_1.91.0.bb rename to meta/recipes-support/boost/boost_1.92.0.bb index 4b580d078b..01fc6bea66 100644 --- a/meta/recipes-support/boost/boost_1.91.0.bb +++ b/meta/recipes-support/boost/boost_1.92.0.bb @@ -4,4 +4,5 @@ require boost.inc SRC_URI += "file://boost-math-disable-pch-for-gcc.patch \ file://0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \ file://0001-dont-setup-compiler-flags-m32-m64.patch \ + file://0001-histogram-move-b2-project-requirements-out-of-build.patch \ "