mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-09-13 09:49:27 +00:00
1849429a79
MongoDB v4.2.0 adds python3 support that is needed by scons upgrade [44f303b scons: inherit python3native]. - mongodb git commit 18ce5c9 was needed to fix https://jira.mongodb.org/browse/SERVER-42787 - Add PREFIX and prefix to scons environment to fix unknown variable check (SConstruct#L1073) - fix musl compilation (strerror_r) - Remove compatibility for clang/x86 due to missing "Hardware interference size" - Previous patches are refreshed Signed-off-by: Vincent Prince <vincent.prince.external@saftbatteries.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
55 lines
2.4 KiB
Diff
55 lines
2.4 KiB
Diff
From c9fc9e9a44b0fb764ce86a5e57f17d3c5bbfd8cd Mon Sep 17 00:00:00 2001
|
|
From: Vincent Prince <vincent.prince.fr@gmail.com>
|
|
Date: Mon, 16 Sep 2019 13:37:10 +0200
|
|
Subject: [PATCH 05/10] Add alises for arm64 which is same as aarch64
|
|
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
Signed-off-by: Vincent Prince <vincent.prince.fr@gmail.com>
|
|
---
|
|
SConstruct | 1 +
|
|
src/third_party/IntelRDFPMathLib20U1/SConscript | 2 +-
|
|
src/third_party/wiredtiger/SConscript | 2 +-
|
|
3 files changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/SConstruct b/SConstruct
|
|
index e63cf15..5593c78 100644
|
|
--- a/SConstruct
|
|
+++ b/SConstruct
|
|
@@ -1129,6 +1129,7 @@ elif endian == "big":
|
|
processor_macros = {
|
|
'arm' : { 'endian': 'little', 'defines': ('__arm__',) },
|
|
'aarch64' : { 'endian': 'little', 'defines': ('__arm64__', '__aarch64__')},
|
|
+ 'arm64' : { 'endian': 'little', 'defines': ('__arm64__', '__aarch64__')},
|
|
'i386' : { 'endian': 'little', 'defines': ('__i386', '_M_IX86')},
|
|
'ppc64le' : { 'endian': 'little', 'defines': ('__powerpc64__',)},
|
|
's390x' : { 'endian': 'big', 'defines': ('__s390x__',)},
|
|
diff --git a/src/third_party/IntelRDFPMathLib20U1/SConscript b/src/third_party/IntelRDFPMathLib20U1/SConscript
|
|
index f23c071..fb82cd6 100644
|
|
--- a/src/third_party/IntelRDFPMathLib20U1/SConscript
|
|
+++ b/src/third_party/IntelRDFPMathLib20U1/SConscript
|
|
@@ -308,7 +308,7 @@ if processor == 'i386' or processor == 'emscripten':
|
|
elif processor == 'arm':
|
|
cpp_defines['IA32'] = '1'
|
|
cpp_defines['ia32'] = '1'
|
|
-elif processor == "aarch64":
|
|
+elif processor == "aarch64" or processor == 'arm64':
|
|
cpp_defines['efi2'] = '1'
|
|
cpp_defines['EFI2'] = '1'
|
|
# Using 64 bit little endian
|
|
diff --git a/src/third_party/wiredtiger/SConscript b/src/third_party/wiredtiger/SConscript
|
|
index cdd090b..97a1b3b 100644
|
|
--- a/src/third_party/wiredtiger/SConscript
|
|
+++ b/src/third_party/wiredtiger/SConscript
|
|
@@ -152,7 +152,7 @@ condition_map = {
|
|
'POSIX_HOST' : not env.TargetOSIs('windows'),
|
|
'WINDOWS_HOST' : env.TargetOSIs('windows'),
|
|
|
|
- 'ARM64_HOST' : env['TARGET_ARCH'] == 'aarch64',
|
|
+ 'ARM64_HOST' : env['TARGET_ARCH'] in ('aarch64', 'arm64'),
|
|
'POWERPC_HOST' : env['TARGET_ARCH'] == 'ppc64le',
|
|
'X86_HOST' : env['TARGET_ARCH'] == 'x86_64',
|
|
'ZSERIES_HOST' : env['TARGET_ARCH'] == 's390x',
|
|
--
|
|
2.7.4
|
|
|