diff options
2 files changed, 35 insertions, 2 deletions
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-apply-msvc-workaround-for-clang-16.patch b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-apply-msvc-workaround-for-clang-16.patch new file mode 100644 index 0000000000..096269308d --- /dev/null +++ b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-apply-msvc-workaround-for-clang-16.patch | |||
| @@ -0,0 +1,32 @@ | |||
| 1 | From 03047c81b2601362bcf79cae67e06d1fba0a6101 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Thu, 2 Mar 2023 20:17:57 -0800 | ||
| 4 | Subject: [PATCH] apply msvc workaround for clang >= 16 | ||
| 5 | |||
| 6 | This avoids a new Werror found with clang16 | ||
| 7 | |||
| 8 | boost-1.70.0/boost/mpl/aux_/integral_wrapper.hpp:73:31: error: integer value -1 is outside the valid range of values [0, 3] for this enumeration type [-Wenum-constexpr-conversion] | ||
| 9 | typedef AUX_WRAPPER_INST( BOOST_MPL_AUX_STATIC_CAST(AUX_WRAPPER_VALUE_TYPE, (value - 1)) ) prior; | ||
| 10 | |||
| 11 | Upstream-Status: Pending | ||
| 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 13 | --- | ||
| 14 | .../boost-1.70.0/boost/mpl/aux_/integral_wrapper.hpp | 2 +- | ||
| 15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 16 | |||
| 17 | diff --git a/src/third_party/boost-1.70.0/boost/mpl/aux_/integral_wrapper.hpp b/src/third_party/boost-1.70.0/boost/mpl/aux_/integral_wrapper.hpp | ||
| 18 | index 6bc05f7e96e..6bb8d24c9ce 100644 | ||
| 19 | --- a/src/third_party/boost-1.70.0/boost/mpl/aux_/integral_wrapper.hpp | ||
| 20 | +++ b/src/third_party/boost-1.70.0/boost/mpl/aux_/integral_wrapper.hpp | ||
| 21 | @@ -56,7 +56,7 @@ struct AUX_WRAPPER_NAME | ||
| 22 | // have to #ifdef here: some compilers don't like the 'N + 1' form (MSVC), | ||
| 23 | // while some other don't like 'value + 1' (Borland), and some don't like | ||
| 24 | // either | ||
| 25 | -#if BOOST_WORKAROUND(__EDG_VERSION__, <= 243) | ||
| 26 | +#if BOOST_WORKAROUND(__EDG_VERSION__, <= 243) || __clang_major__ > 15 | ||
| 27 | private: | ||
| 28 | BOOST_STATIC_CONSTANT(AUX_WRAPPER_VALUE_TYPE, next_value = BOOST_MPL_AUX_STATIC_CAST(AUX_WRAPPER_VALUE_TYPE, (N + 1))); | ||
| 29 | BOOST_STATIC_CONSTANT(AUX_WRAPPER_VALUE_TYPE, prior_value = BOOST_MPL_AUX_STATIC_CAST(AUX_WRAPPER_VALUE_TYPE, (N - 1))); | ||
| 30 | -- | ||
| 31 | 2.39.2 | ||
| 32 | |||
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb index 253187e33c..f35fb630e6 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb +++ b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb | |||
| @@ -11,9 +11,9 @@ DEPENDS = "openssl libpcap zlib boost curl python3 \ | |||
| 11 | 11 | ||
| 12 | inherit scons dos2unix siteinfo python3native systemd useradd | 12 | inherit scons dos2unix siteinfo python3native systemd useradd |
| 13 | 13 | ||
| 14 | PV = "4.4.18" | 14 | PV = "4.4.19" |
| 15 | #v4.4.18 | 15 | #v4.4.18 |
| 16 | SRCREV = "8ed32b5c2c68ebe7f8ae2ebe8d23f36037a17dea" | 16 | SRCREV = "9a996e0ad993148b9650dc402e6d3b1804ad3b8a" |
| 17 | SRC_URI = "git://github.com/mongodb/mongo.git;branch=v4.4;protocol=https \ | 17 | SRC_URI = "git://github.com/mongodb/mongo.git;branch=v4.4;protocol=https \ |
| 18 | file://0001-Tell-scons-to-use-build-settings-from-environment-va.patch \ | 18 | file://0001-Tell-scons-to-use-build-settings-from-environment-va.patch \ |
| 19 | file://0001-Use-long-long-instead-of-int64_t.patch \ | 19 | file://0001-Use-long-long-instead-of-int64_t.patch \ |
| @@ -34,6 +34,7 @@ SRC_URI = "git://github.com/mongodb/mongo.git;branch=v4.4;protocol=https \ | |||
| 34 | file://0001-server-Adjust-the-cache-alignment-assumptions.patch \ | 34 | file://0001-server-Adjust-the-cache-alignment-assumptions.patch \ |
| 35 | file://0001-The-std-lib-unary-binary_function-base-classes-are-d.patch \ | 35 | file://0001-The-std-lib-unary-binary_function-base-classes-are-d.patch \ |
| 36 | file://0001-free_mon-Include-missing-cstdint.patch \ | 36 | file://0001-free_mon-Include-missing-cstdint.patch \ |
| 37 | file://0001-apply-msvc-workaround-for-clang-16.patch \ | ||
| 37 | " | 38 | " |
| 38 | SRC_URI:append:libc-musl ="\ | 39 | SRC_URI:append:libc-musl ="\ |
| 39 | file://0001-Mark-one-of-strerror_r-implementation-glibc-specific.patch \ | 40 | file://0001-Mark-one-of-strerror_r-implementation-glibc-specific.patch \ |
