diff --git a/tests/scripts/fdb_build.sh b/tests/scripts/fdb_build.sh index 4714ad7d1..77ec18313 100644 --- a/tests/scripts/fdb_build.sh +++ b/tests/scripts/fdb_build.sh @@ -141,8 +141,8 @@ if [[ ${ID} == 'ubuntu' || ${ID} == 'debian' ]]; then ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime DEBIAN_FRONTEND=noninteractive apt install -y -qq automake cmake curl file g++ gcc git jq libjemalloc-dev libssl-dev mono-devel patch python3-dev python3-venv unzip - if [[ ${OS_ID} == 'ubuntu' && ${VERSION_ID} == '20.04' || ${OS_ID} == 'debian' && ${VERSION_ID} == '11' ]]; then - install_clang ${OS_ID} + if [[ ${ID} == 'ubuntu' && ${VERSION_ID} == '20.04' || ${ID} == 'debian' && ${VERSION_ID} == '11' ]]; then + install_clang ${ID} fi elif [[ ${ID} == "rocky" ]]; then @@ -191,6 +191,13 @@ message "Downloading sources" wget https://github.com/apple/foundationdb/archive/refs/tags/${FDB_VERSION}.zip unzip -q ${FDB_VERSION}.zip + +message "Patching sources" +cd foundationdb-${FDB_VERSION} +patch -p1 -i ../mariadb_foundationdb-7.1.63_gcc.patch +cd - + + message "Configuring cmake" mkdir -p fdb_build cd fdb_build diff --git a/tests/scripts/mariadb_foundationdb-7.3.43_gcc.patch b/tests/scripts/mariadb_foundationdb-7.3.43_gcc.patch new file mode 100644 index 000000000..71a994dcd --- /dev/null +++ b/tests/scripts/mariadb_foundationdb-7.3.43_gcc.patch @@ -0,0 +1,12 @@ +--- a/fdbbackup/FileDecoder.actor.cpp 2024-11-15 12:10:29.888975838 +0000 ++++ b/fdbbackup/FileDecoder.actor.cpp 2024-11-15 12:09:42.619162451 +0000 +@@ -634,7 +634,7 @@ + } + } + +- self->lfd = open(self->file.fileName.c_str(), O_WRONLY | O_CREAT | O_TRUNC); ++ self->lfd = open(self->file.fileName.c_str(), O_WRONLY | O_CREAT | O_TRUNC, 0600); + + if (self->lfd == -1) { + TraceEvent(SevError, "OpenLocalFileFailed").detail("File", self->file.fileName); + throw platform_error();