Skip to content

Commit

Permalink
databases/mongodb44: enable build for Raspberry Pi
Browse files Browse the repository at this point in the history
Upstream stopt supporting non-LSE ARM cpus (read RPI).
See: https://jira.mongodb.org/browse/SERVER-71772
For POLA I still enable this for the Q3 branch.

PR:	272294
  • Loading branch information
Ronald Klop authored and Ronald Klop committed Jun 30, 2023
1 parent 0012813 commit b0aa4da
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 9 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- src/third_party/mozjs-60/gen-config.sh.orig 2019-10-11 03:28:57 UTC
--- src/third_party/mozjs-60/gen-config.sh.orig 2023-05-10 02:21:42 UTC
+++ src/third_party/mozjs-60/gen-config.sh
@@ -28,6 +28,9 @@ _xcode_setup() {
@@ -28,6 +28,9 @@ case "$_Path" in
}

case "$_Path" in
Expand All @@ -10,7 +10,7 @@
"platform/aarch64/linux")
_CONFIG_OPTS="--host=aarch64-linux"
;;
@@ -82,9 +85,9 @@ esac
@@ -82,9 +85,9 @@ rm config.cache || true
cd mozilla-release/js/src
rm config.cache || true

Expand Down
21 changes: 15 additions & 6 deletions databases/mongodb44/files/patch-SConstruct
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- SConstruct.orig 2021-07-07 09:17:06 UTC
--- SConstruct.orig 2023-05-10 02:21:42 UTC
+++ SConstruct
@@ -1213,9 +1213,9 @@ if has_option('variables-help'):
@@ -1269,9 +1269,9 @@ if has_option('variables-help'):
print(env_vars.GenerateHelpText(env))
Exit(0)

Expand All @@ -11,9 +11,9 @@
+#if unknown_vars:
+# env.FatalError("Unknown variables specified: {0}", ", ".join(list(unknown_vars.keys())))

if get_option('install-action') != 'default' and get_option('ninja') != "disabled":
env.FatalError("Cannot use non-default install actions when generating Ninja.")
@@ -2091,7 +2091,7 @@ if env.TargetOSIs('posix'):
install_actions.setup(env, get_option('install-action'))

@@ -2196,7 +2196,7 @@ if env.TargetOSIs('posix'):
# If runtime hardening is requested, then build anything
# destined for an executable with the necessary flags for PIE.
env.AppendUnique(
Expand All @@ -22,7 +22,7 @@
PROGLINKFLAGS=['-pie'],
)

@@ -2106,7 +2106,7 @@ if env.TargetOSIs('posix'):
@@ -2211,7 +2211,7 @@ if env.TargetOSIs('posix'):
"-Wno-unknown-pragmas",
"-Winvalid-pch"] )
# env.Append( " -Wconversion" ) TODO: this doesn't really work yet
Expand All @@ -31,3 +31,12 @@
if not has_option("disable-warnings-as-errors"):
env.Append( CCFLAGS=["-Werror"] )

@@ -2297,7 +2297,7 @@ if env.ToolchainIs('GCC', 'clang'):
elif env['TARGET_ARCH'] == 'aarch64':
# If we are using GCC or clang to target aarch64, set the arch to be armv8.2-a,
# This is to prevent a bug with WT see SERVER-71772 for more details
- env.Append( CCFLAGS=['-march=armv8.2-a', '-mtune=generic'] )
+ env.Append( CCFLAGS=['-march=armv8-a+crc', '-mtune=generic'] )

# Needed for auth tests since key files are stored in git with mode 644.
if not env.TargetOSIs('windows'):
8 changes: 8 additions & 0 deletions databases/mongodb44/pkg-message
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[
{ type: install
message: <<EOM
MongoDB on Rasperry Pi can work but is unsupported upstream.
Please read https://jira.mongodb.org/browse/SERVER-71772 if you run this on a non-LSE ARM cpu.
EOM
}
]

0 comments on commit b0aa4da

Please sign in to comment.