summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2021-03-13 10:05:41 -0800
committerKhem Raj <raj.khem@gmail.com>2021-03-13 10:06:17 -0800
commit71668086d0505844961d8f85a80f698b46e9a8f9 (patch)
tree894b0788ea675807e2cc0b613df5fd8538189f41
parent70af4c73c70c7884435ed4eccd52d8a964e160d1 (diff)
downloadmeta-openembedded-71668086d0505844961d8f85a80f698b46e9a8f9.tar.gz
mongodb: Fix cross build on ppc64le
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/disable_runtime_check.patch17
-rw-r--r--meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb8
2 files changed, 22 insertions, 3 deletions
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/disable_runtime_check.patch b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/disable_runtime_check.patch
new file mode 100644
index 0000000000..78ebba8fb7
--- /dev/null
+++ b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/disable_runtime_check.patch
@@ -0,0 +1,17 @@
1Lets use cached result for this otherwise runtime test, on qemuppc64
2when this test is run using gcc11, it returns 1, since we dont worry
3about older compilers here, we can cache the result and use it here
4
5Upstream-Status: Inappropriate [Cross-compile specific]
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7--- a/SConstruct
8+++ b/SConstruct
9@@ -3904,7 +3904,7 @@ def doConfigure(myenv):
10
11 conf.AddTest('CheckAltivecVbpermqOutput', CheckAltivecVbpermqOutput)
12
13- outputIndex = next((idx for idx in [0,1] if conf.CheckAltivecVbpermqOutput(idx)), None)
14+ outputIndex = 1
15 if outputIndex is not None:
16 conf.env.SetConfigHeaderDefine("MONGO_CONFIG_ALTIVEC_VEC_VBPERMQ_OUTPUT_INDEX", outputIndex)
17 else:
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 2edd345590..3214918db8 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
@@ -28,6 +28,7 @@ SRC_URI = "git://github.com/mongodb/mongo.git;branch=v4.4 \
28 file://0001-Fix-compilation-with-fno-common.patch \ 28 file://0001-Fix-compilation-with-fno-common.patch \
29 file://0001-stacktrace-Define-ARCH_BITS-for-x86.patch \ 29 file://0001-stacktrace-Define-ARCH_BITS-for-x86.patch \
30 file://0001-include-needed-c-header.patch \ 30 file://0001-include-needed-c-header.patch \
31 file://disable_runtime_check.patch \
31 " 32 "
32SRC_URI_append_libc-musl ="\ 33SRC_URI_append_libc-musl ="\
33 file://0001-Mark-one-of-strerror_r-implementation-glibc-specific.patch \ 34 file://0001-Mark-one-of-strerror_r-implementation-glibc-specific.patch \
@@ -56,12 +57,15 @@ PACKAGECONFIG[tcmalloc] = "--use-system-tcmalloc,--allocator=system,gperftools,"
56PACKAGECONFIG[shell] = ",--js-engine=none,," 57PACKAGECONFIG[shell] = ",--js-engine=none,,"
57PACKAGECONFIG[system-pcre] = "--use-system-pcre,,libpcre," 58PACKAGECONFIG[system-pcre] = "--use-system-pcre,,libpcre,"
58 59
60MONGO_ARCH ?= "${HOST_ARCH}"
61MONGO_ARCH_powerpc64le = "ppc64le"
62
59EXTRA_OESCONS = "PREFIX=${prefix} \ 63EXTRA_OESCONS = "PREFIX=${prefix} \
60 DESTDIR=${D} \ 64 DESTDIR=${D} \
61 LIBPATH=${STAGING_LIBDIR} \ 65 LIBPATH=${STAGING_LIBDIR} \
62 LINKFLAGS='${LDFLAGS}' \ 66 LINKFLAGS='${LDFLAGS}' \
63 CXXFLAGS='${CXXFLAGS}' \ 67 CXXFLAGS='${CXXFLAGS}' \
64 TARGET_ARCH=${TARGET_ARCH} \ 68 TARGET_ARCH=${MONGO_ARCH} \
65 MONGO_VERSION=${PV} \ 69 MONGO_VERSION=${PV} \
66 OBJCOPY=${OBJCOPY} \ 70 OBJCOPY=${OBJCOPY} \
67 --ssl \ 71 --ssl \
@@ -116,5 +120,3 @@ scons_do_install() {
116CONFFILES_${PN} = "${sysconfdir}/mongod.conf" 120CONFFILES_${PN} = "${sysconfdir}/mongod.conf"
117 121
118SYSTEMD_SERVICE_${PN} = "mongod.service" 122SYSTEMD_SERVICE_${PN} = "mongod.service"
119
120