From 5a65011e62f5086d0de56c6d75dbe21743eba93b Mon Sep 17 00:00:00 2001 From: "Nathaniel.Belles" Date: Sat, 23 Mar 2024 02:05:39 -0400 Subject: [PATCH] GUACAMOLE-1374: Adding extensible architecture-specific build options --- src/guacd-docker/bin/build-all.sh | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/guacd-docker/bin/build-all.sh b/src/guacd-docker/bin/build-all.sh index e6778a12d..b8c33b8f3 100755 --- a/src/guacd-docker/bin/build-all.sh +++ b/src/guacd-docker/bin/build-all.sh @@ -95,11 +95,27 @@ install_from_git() { } +# +# Determine any option overrides to guarantee successful build +# + +export BUILD_ARCHITECTURE="$(arch)" # Determine architecture building on +echo "Build architecture: $BUILD_ARCHITECTURE" + +case $BUILD_ARCHITECTURE in + armv6l|armv7l|aarch64) + export FREERDP_OPTS_OVERRIDES="-DWITH_SSE2=OFF" # Disable SSE2 on ARM + ;; + *) + export FREERDP_OPTS_OVERRIDES="" + ;; +esac + # # Build and install core protocol library dependencies # -install_from_git "https://github.com/FreeRDP/FreeRDP" "$WITH_FREERDP" $FREERDP_OPTS +install_from_git "https://github.com/FreeRDP/FreeRDP" "$WITH_FREERDP" $FREERDP_OPTS $FREERDP_OPTS_OVERRIDES install_from_git "https://github.com/libssh2/libssh2" "$WITH_LIBSSH2" $LIBSSH2_OPTS install_from_git "https://github.com/seanmiddleditch/libtelnet" "$WITH_LIBTELNET" $LIBTELNET_OPTS install_from_git "https://github.com/LibVNC/libvncserver" "$WITH_LIBVNCCLIENT" $LIBVNCCLIENT_OPTS