diff options
Diffstat (limited to 'meta/recipes-support/boost')
-rw-r--r-- | meta/recipes-support/boost/boost-1.78.0.inc (renamed from meta/recipes-support/boost/boost-1.75.0.inc) | 6 | ||||
-rw-r--r-- | meta/recipes-support/boost/boost-build-native_4.4.1.bb (renamed from meta/recipes-support/boost/boost-build-native_4.3.0.bb) | 8 | ||||
-rw-r--r-- | meta/recipes-support/boost/boost.inc | 41 | ||||
-rw-r--r-- | meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch | 15 | ||||
-rw-r--r-- | meta/recipes-support/boost/boost/0001-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch | 54 | ||||
-rw-r--r-- | meta/recipes-support/boost/boost/0001-futex-fix-build-on-32-bit-architectures-using-64-bit.patch | 36 | ||||
-rw-r--r-- | meta/recipes-support/boost/boost/de657e01635306085488290ea83de541ec393f8b.patch | 30 | ||||
-rw-r--r-- | meta/recipes-support/boost/boost_1.78.0.bb (renamed from meta/recipes-support/boost/boost_1.75.0.bb) | 6 |
8 files changed, 107 insertions, 89 deletions
diff --git a/meta/recipes-support/boost/boost-1.75.0.inc b/meta/recipes-support/boost/boost-1.78.0.inc index e5a8488c58..729a47b54f 100644 --- a/meta/recipes-support/boost/boost-1.75.0.inc +++ b/meta/recipes-support/boost/boost-1.78.0.inc @@ -11,10 +11,10 @@ BOOST_VER = "${@"_".join(d.getVar("PV").split("."))}" BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}" BOOST_P = "boost_${BOOST_VER}" -SRC_URI = "https://dl.bintray.com/boostorg/release/${PV}/source/${BOOST_P}.tar.bz2" -SRC_URI[sha256sum] = "953db31e016db7bb207f11432bef7df100516eeb746843fa0486a222e3fd49cb" +SRC_URI = "https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/${BOOST_P}.tar.bz2" +SRC_URI[sha256sum] = "8681f175d4bdb26c52222665793eef08490d7758529330f98d3b29dd0735bccc" UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/" -UPSTREAM_CHECK_REGEX = "boostorg/release/(?P<pver>.*)/source/" +UPSTREAM_CHECK_REGEX = "release/(?P<pver>.*)/source/" S = "${WORKDIR}/${BOOST_P}" diff --git a/meta/recipes-support/boost/boost-build-native_4.3.0.bb b/meta/recipes-support/boost/boost-build-native_4.4.1.bb index 19e991e65f..de566eeb82 100644 --- a/meta/recipes-support/boost/boost-build-native_4.3.0.bb +++ b/meta/recipes-support/boost/boost-build-native_4.4.1.bb @@ -6,8 +6,8 @@ SECTION = "devel" LICENSE = "BSL-1.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" -SRC_URI = "git://github.com/boostorg/build;protocol=https" -SRCREV = "632ea768f3eb225b4472c5ed6d20afee708724ad" +SRC_URI = "git://github.com/boostorg/build;protocol=https;branch=master" +SRCREV = "76da80f33187a3d9e5336157cdfae12ce82e37eb" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+){2,}))" @@ -20,8 +20,8 @@ do_compile() { } do_install() { - ./b2 install --prefix=${prefix} staging-prefix=${D}${prefix} + HOME=/var/run ./b2 install --prefix=${prefix} staging-prefix=${D}${prefix} } # The build is either release mode (pre-stripped) or debug (-O0). -INSANE_SKIP_${PN} = "already-stripped" +INSANE_SKIP:${PN} = "already-stripped" diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc index 291a052ec6..402f1592cf 100644 --- a/meta/recipes-support/boost/boost.inc +++ b/meta/recipes-support/boost/boost.inc @@ -8,8 +8,8 @@ DEPENDS = "boost-build-native zlib bzip2" CVE_PRODUCT = "boost:boost" -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" +ARM_INSTRUCTION_SET:armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" B = "${WORKDIR}/build" do_configure[cleandirs] = "${B}" @@ -28,6 +28,7 @@ BOOST_LIBS = "\ graph \ headers \ iostreams \ + json \ log \ math \ program_options \ @@ -71,35 +72,35 @@ python __anonymous () { if "-native" in pn: pkg = pkg + "-native" packages.append(mlprefix + pkg) - if not d.getVar("FILES_%s" % pkg): - d.setVar("FILES_%s%s" % (mlprefix, pkg), "${libdir}/libboost_%s*.so.*" % lib) + if not d.getVar("FILES:%s" % pkg): + d.setVar("FILES:%s%s" % (mlprefix, pkg), "${libdir}/libboost_%s*.so.*" % lib) else: - d.setVar("FILES_%s%s" % (mlprefix, pkg), d.getVar("FILES_%s" % pkg)) + d.setVar("FILES:%s%s" % (mlprefix, pkg), d.getVar("FILES:%s" % pkg)) d.setVar("BOOST_PACKAGES", " ".join(packages)) d.setVar("BJAM_EXTRA", " ".join(extras)) } # Override the contents of specific packages -FILES_${PN}-graph_parallel = "${libdir}/libboost_graph_parallel.so.*" -FILES_${PN}-locale = "${libdir}/libboost_locale.so.*" -FILES_${PN}-mpi = "${libdir}/mpi.so ${libdir}/libboost_mpi*.so.*" -FILES_boost-serialization = "${libdir}/libboost_serialization*.so.* \ +FILES:${PN}-graph_parallel = "${libdir}/libboost_graph_parallel.so.*" +FILES:${PN}-locale = "${libdir}/libboost_locale.so.*" +FILES:${PN}-mpi = "${libdir}/mpi.so ${libdir}/libboost_mpi*.so.*" +FILES:boost-serialization = "${libdir}/libboost_serialization*.so.* \ ${libdir}/libboost_wserialization*.so.*" -FILES_boost-test = "${libdir}/libboost_prg_exec_monitor*.so.* \ +FILES:boost-test = "${libdir}/libboost_prg_exec_monitor*.so.* \ ${libdir}/libboost_unit_test_framework*.so.*" # -dev last to pick up the remaining stuff PACKAGES += "${PN}-dev ${PN}-staticdev" -FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so ${libdir}/cmake" -FILES_${PN}-staticdev = "${libdir}/libboost_*.a" +FILES:${PN}-dev = "${includedir} ${libdir}/libboost_*.so ${libdir}/cmake" +FILES:${PN}-staticdev = "${libdir}/libboost_*.a" # "boost" is a metapackage which pulls in all boost librabries PACKAGES += "${PN}" -FILES_${PN} = "" -ALLOW_EMPTY_${PN} = "1" -RRECOMMENDS_${PN} += "${BOOST_PACKAGES}" -RRECOMMENDS_${PN}_class-native = "" +FILES:${PN} = "" +ALLOW_EMPTY:${PN} = "1" +RRECOMMENDS:${PN} += "${BOOST_PACKAGES}" +RRECOMMENDS:${PN}:class-native = "" # to avoid GNU_HASH QA errors added LDFLAGS to ARCH; a little bit dirty but at least it works TARGET_CC_ARCH += "${LDFLAGS}" @@ -155,14 +156,14 @@ BJAM_OPTS = '${BOOST_PARALLEL_MAKE} -d+2 -q \ ${BJAM_EXTRA}' # Native compilation of bzip2 isn't working -BJAM_OPTS_append_class-native = ' -sNO_BZIP2=1' +BJAM_OPTS:append:class-native = ' -sNO_BZIP2=1' # Adjust the build for x32 -BJAM_OPTS_append_x86-x32 = " abi=x32 address-model=64" +BJAM_OPTS:append:x86-x32 = " abi=x32 address-model=64" # cross compiling for arm fails to detect abi, so provide some help -BJAM_OPTS_append_arm = " abi=aapcs architecture=arm" -BJAM_OPTS_append_aarch64 = " abi=aapcs address-model=64 architecture=arm" +BJAM_OPTS:append:arm = " abi=aapcs architecture=arm" +BJAM_OPTS:append:aarch64 = " abi=aapcs address-model=64 architecture=arm" do_configure() { cd ${S} 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 91ab53efd9..67d5dff125 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 8e1d30454afde37eaa3c593ec19d108cd5ed10d0 Mon Sep 17 00:00:00 2001 +From 4d2a8fc8117e56bc283349e5f7f889ebbfc55c71 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Tue, 18 Dec 2018 15:42:57 +0100 Subject: [PATCH] Don't set up arch/instruction-set flags, we do that @@ -10,14 +10,14 @@ Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> --- - tools/build/src/tools/gcc.jam | 139 ---------------------------------- - 1 file changed, 139 deletions(-) + tools/build/src/tools/gcc.jam | 144 ---------------------------------- + 1 file changed, 144 deletions(-) diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam -index ff3209f7b..70cbc39a5 100644 +index 47a113223..d77525724 100644 --- a/tools/build/src/tools/gcc.jam +++ b/tools/build/src/tools/gcc.jam -@@ -1217,142 +1217,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + : +@@ -1122,147 +1122,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + : <architecture>$(architecture)/<instruction-set>$(instruction-set) : $(values) ; } @@ -158,5 +158,10 @@ index ff3209f7b..70cbc39a5 100644 -cpu-flags gcc OPTIONS : s390x : z13 : -march=z13 ; -cpu-flags gcc OPTIONS : s390x : z14 : -march=z14 ; -cpu-flags gcc OPTIONS : s390x : z15 : -march=z15 ; +-# ARM +-cpu-flags gcc OPTIONS : arm : cortex-a9+vfpv3 : -mcpu=cortex-a9 -mfpu=vfpv3 -mfloat-abi=hard ; +-cpu-flags gcc OPTIONS : arm : cortex-a53 : -mcpu=cortex-a53 ; +-cpu-flags gcc OPTIONS : arm : cortex-r5 : -mcpu=cortex-r5 ; +-cpu-flags gcc OPTIONS : arm : cortex-r5+vfpv3-d16 : -mcpu=cortex-r5 -mfpu=vfpv3-d16 -mfloat-abi=hard ; -# AIX variant of RS/6000 & PowerPC -toolset.flags gcc AROPTIONS <address-model>64/<target-os>aix : "-X64" ; diff --git a/meta/recipes-support/boost/boost/0001-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch b/meta/recipes-support/boost/boost/0001-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch deleted file mode 100644 index 523568e9bc..0000000000 --- a/meta/recipes-support/boost/boost/0001-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch +++ /dev/null @@ -1,54 +0,0 @@ -From d6f7b6064dc91d1d5fa18554b40b14822ab7a32b Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 16 Oct 2020 11:13:22 -0700 -Subject: [PATCH] fiber,libs: Define SYS_futex if it does not exist - -__NR_futex is not defines by newer architectures e.g. arc, riscv32 as -they only have 64bit variant of time_t. Glibc defines SYS_futex interface based on -__NR_futex, since this is used in applications, such applications start -to fail to build for these newer architectures. This patch defines a -fallback to alias __NR_futex to __NR_futex_tim64 so SYS_futex keeps -working - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - boost/fiber/detail/futex.hpp | 5 +++++ - libs/log/src/event.cpp | 4 ++++ - 2 files changed, 9 insertions(+) - -diff --git a/boost/fiber/detail/futex.hpp b/boost/fiber/detail/futex.hpp -index e64bd5990..16bee64f1 100644 ---- a/boost/fiber/detail/futex.hpp -+++ b/boost/fiber/detail/futex.hpp -@@ -17,6 +17,11 @@ extern "C" { - #include <linux/futex.h> - #include <sys/syscall.h> - } -+ -+#if !defined(SYS_futex) && defined(SYS_futex_time64) -+#define SYS_futex SYS_futex_time64 -+#endif -+ - #elif BOOST_OS_WINDOWS - #include <windows.h> - #endif -diff --git a/libs/log/src/event.cpp b/libs/log/src/event.cpp -index 5485154d7..2c7c0381f 100644 ---- a/libs/log/src/event.cpp -+++ b/libs/log/src/event.cpp -@@ -31,6 +31,10 @@ - #include <linux/futex.h> - #include <boost/memory_order.hpp> - -+#if !defined(SYS_futex) && defined(SYS_futex_time64) -+#define SYS_futex SYS_futex_time64 -+#endif -+ - // Some Android NDKs (Google NDK and older Crystax.NET NDK versions) don't define SYS_futex - #if defined(SYS_futex) - #define BOOST_LOG_SYS_FUTEX SYS_futex --- -2.28.0 - diff --git a/meta/recipes-support/boost/boost/0001-futex-fix-build-on-32-bit-architectures-using-64-bit.patch b/meta/recipes-support/boost/boost/0001-futex-fix-build-on-32-bit-architectures-using-64-bit.patch new file mode 100644 index 0000000000..20dc3ca54e --- /dev/null +++ b/meta/recipes-support/boost/boost/0001-futex-fix-build-on-32-bit-architectures-using-64-bit.patch @@ -0,0 +1,36 @@ +From b15d8d0754bb545ba10d0cfba8bbfdfb22a62c38 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 20 Feb 2022 22:03:14 -0800 +Subject: [PATCH] futex: fix build on 32-bit architectures using 64-bit time_t + +Fix the following build failure on 32-bit architectures using 64-bit +time_t (e.g. riscv32): +| ./boost/fiber/detail/futex.hpp:31:23: error: use of undeclared identifier 'SYS_futex' +| return ::syscall( SYS_futex, addr, op, x, nullptr, nullptr, 0); +| ^ +| 1 error generated. + +Upstream-Status: Submitted [https://github.com/boostorg/fiber/pull/292] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + boost/fiber/detail/futex.hpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/boost/fiber/detail/futex.hpp b/boost/fiber/detail/futex.hpp +index e64bd5990..d0353e9e5 100644 +--- a/boost/fiber/detail/futex.hpp ++++ b/boost/fiber/detail/futex.hpp +@@ -12,6 +12,10 @@ + + #include <boost/fiber/detail/config.hpp> + ++#ifndef SYS_futex ++#define SYS_futex SYS_futex_time64 ++#endif ++ + #if BOOST_OS_LINUX + extern "C" { + #include <linux/futex.h> +-- +2.35.1 + diff --git a/meta/recipes-support/boost/boost/de657e01635306085488290ea83de541ec393f8b.patch b/meta/recipes-support/boost/boost/de657e01635306085488290ea83de541ec393f8b.patch new file mode 100644 index 0000000000..867ec03ba6 --- /dev/null +++ b/meta/recipes-support/boost/boost/de657e01635306085488290ea83de541ec393f8b.patch @@ -0,0 +1,30 @@ +From de657e01635306085488290ea83de541ec393f8b Mon Sep 17 00:00:00 2001 +From: Leonardo Neumann <leonardo@neumann.dev.br> +Date: Mon, 13 Dec 2021 01:07:20 -0300 +Subject: [PATCH] Fix missing sys/stat.h include on musl-based systems + +Boost 1.78.0 fails to build on musl-based systems because musl does +not include sys/stat.h by default. + +Fixes #161 ("Boost compiler error") +Upstream-Status: Submitted [https://github.com/boostorg/interprocess/pull/162] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + include/boost/interprocess/permissions.hpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/boost/interprocess/permissions.hpp b/boost/interprocess/permissions.hpp +index ab55411e..0b21a685 100644 +--- a/boost/interprocess/permissions.hpp ++++ b/boost/interprocess/permissions.hpp +@@ -29,6 +29,10 @@ + + #include <boost/interprocess/detail/win32_api.hpp> + ++#else ++ ++#include <sys/stat.h> ++ + #endif + + #endif //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED diff --git a/meta/recipes-support/boost/boost_1.75.0.bb b/meta/recipes-support/boost/boost_1.78.0.bb index 23b0ffc67e..58be9dcf12 100644 --- a/meta/recipes-support/boost/boost_1.75.0.bb +++ b/meta/recipes-support/boost/boost_1.78.0.bb @@ -1,10 +1,10 @@ require boost-${PV}.inc require boost.inc -SRC_URI += " \ - file://boost-CVE-2012-2677.patch \ +SRC_URI += "file://boost-CVE-2012-2677.patch \ 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-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch \ + file://de657e01635306085488290ea83de541ec393f8b.patch \ + file://0001-futex-fix-build-on-32-bit-architectures-using-64-bit.patch \ " |