From fc088dbe495e5745801d8dfc9fb0e868b874b7ab Mon Sep 17 00:00:00 2001 From: Lukas Javorsky Date: Thu, 16 Dec 2021 12:34:44 +0100 Subject: [PATCH] Revert "Disable dtrace for the arm architecture due to FTBFS during gcc compiling" This reverts commit b3e0e11edd8abe2f038f2675c714ae3bcaaa1eb2. The issue in systemtap is fixed now https://sourceware.org/git/?p=systemtap.git;a=commit;h=34facf7ee6b43dae66cc109973a4eda42e439163 --- mariadb.spec | 8 -------- 1 file changed, 8 deletions(-) diff --git a/mariadb.spec b/mariadb.spec index 0cf5b34..34797a9 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -844,11 +844,7 @@ fi -DGRN_DATA_DIR=share/%{name}-server/groonga \ -DGROONGA_NORMALIZER_MYSQL_PROJECT_NAME=%{name}-server/groonga-normalizer-mysql \ -DENABLED_LOCAL_INFILE=ON \ - %ifarch %{arm} - -DENABLE_DTRACE=OFF \ - %else -DENABLE_DTRACE=ON \ - %endif -DSECURITY_HARDENED=ON \ -DWITH_WSREP=%{?with_galera:ON}%{!?with_galera:OFF} \ -DWITH_INNODB_DISALLOW_WRITES=%{?with_galera:ON}%{!?with_galera:OFF} \ @@ -878,10 +874,6 @@ fi -DCONNECT_WITH_JDBC=OFF \ %{?with_debug: -DCMAKE_BUILD_TYPE=Debug -DWITH_ASAN=OFF -DWITH_INNODB_EXTRA_DEBUG=ON -DWITH_VALGRIND=ON} -# The DTRACE option started to fail on the armv7hl architecture. -# This issue is already beeing discussed in the GCC upstream bugzilla. -# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=103395 -# Whenever this issue is fixed in the GCC, we can enable the DTRACE for ARM again. CFLAGS="$CFLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" # force PIC mode so that we can build libmysqld.so