diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2021-07-31 18:23:32 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2021-08-03 08:53:04 -0700 |
| commit | 581167a2583a84ac1344de843c8b33b3c565fb67 (patch) | |
| tree | 61cdffeea596f6a85abe81b8252b47ef773f40ef /meta-oe/dynamic-layers | |
| parent | daf661d19b78d013a6af6ff0a9e9bee3473ee3ab (diff) | |
| download | meta-openembedded-contrib-581167a2583a84ac1344de843c8b33b3c565fb67.tar.gz | |
mongodb: Upgrade to 4.4.7
Fix build with glibc 2.34+ while here
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/dynamic-layers')
| -rw-r--r-- | meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/PTHREAD_STACK_MIN.patch | 19 | ||||
| -rw-r--r-- | meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb | 7 |
2 files changed, 23 insertions, 3 deletions
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/PTHREAD_STACK_MIN.patch b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/PTHREAD_STACK_MIN.patch new file mode 100644 index 0000000000..f08177d7b4 --- /dev/null +++ b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/PTHREAD_STACK_MIN.patch @@ -0,0 +1,19 @@ +PTHREAD_STACK_MIN is no longer a compile time define in glibc 2.34+ and since +we only care for glibc and musl where PTHREAD_STACK_MIN is always defined there +is no need to check for constant called PTHREAD_STACK_MIN since its already defined +this fix may not work for wider audience but for OE needs its sufficient + +Upstream-Status: Inappropriate [OE-only fix] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/src/third_party/boost-1.70.0/boost/thread/pthread/thread_data.hpp ++++ b/src/third_party/boost-1.70.0/boost/thread/pthread/thread_data.hpp +@@ -57,9 +57,7 @@ namespace boost + #else + std::size_t page_size = ::sysconf( _SC_PAGESIZE); + #endif +-#if PTHREAD_STACK_MIN > 0 + if (size<PTHREAD_STACK_MIN) size=PTHREAD_STACK_MIN; +-#endif + size = ((size+page_size-1)/page_size)*page_size; + int res = pthread_attr_setstacksize(&val_, size); + BOOST_VERIFY(!res && "pthread_attr_setstacksize failed"); 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 9c1e485b31..9d461078ae 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 \ inherit scons dos2unix siteinfo python3native systemd useradd -PV = "4.4.6" -#v4.4.6 -SRCREV = "72e66213c2c3eab37d9358d5e78ad7f5c1d0d0d7" +PV = "4.4.7" +#v4.4.7 +SRCREV = "abb6b9c2bf675e9e2aeaecba05f0f8359d99e203" SRC_URI = "git://github.com/mongodb/mongo.git;branch=v4.4 \ file://0001-Tell-scons-to-use-build-settings-from-environment-va.patch \ file://0001-Use-long-long-instead-of-int64_t.patch \ @@ -31,6 +31,7 @@ SRC_URI = "git://github.com/mongodb/mongo.git;branch=v4.4 \ file://ppc64_ARCH_BITS.patch \ file://0001-Do-not-use-MINSIGSTKSZ.patch \ file://0001-Use-explicit-typecast-to-size_t.patch \ + file://PTHREAD_STACK_MIN.patch \ " SRC_URI_append_libc-musl ="\ file://0001-Mark-one-of-strerror_r-implementation-glibc-specific.patch \ |