Accepting request 657991 from server:database
OBS-URL: https://build.opensuse.org/request/show/657991 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb?expand=0&rev=80
This commit is contained in:
commit
359232fddb
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 12 13:38:00 UTC 2018 - kstreitova@suse.com
|
||||
|
||||
- remove PerconaFT from the package as it has AGPL licence
|
||||
[bsc#1118754]
|
||||
- use a new syntax for cmake variables that specify which plugin
|
||||
will be built
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Dec 1 09:44:46 UTC 2018 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
|
||||
|
||||
|
10
mariadb.spec
10
mariadb.spec
@ -39,6 +39,7 @@
|
||||
# see https://mariadb.com/kb/en/mariadb/tokudb/
|
||||
# Temporarily stop to build it as jemalloc 5 is not backwards compatible
|
||||
# and a build without jemalloc is not supported upstream (MDEV-15034)
|
||||
# Also we can't use PerconaFT (AGPL licence) that is needed for tokudb
|
||||
%define with_tokudb 0
|
||||
# Mroonga currently only supports the x86_64 architecture
|
||||
# see https://mariadb.com/kb/en/mariadb/about-mroonga/
|
||||
@ -365,6 +366,9 @@ cat %{SOURCE50} | tee -a mysql-test/unstable-tests
|
||||
# Remove python scripts remains from tokudb upstream (those files are not used anyway)
|
||||
rm -r storage/tokudb/mysql-test/tokudb/t/*.py
|
||||
|
||||
# Remove PerconaFT from the package because it has AGPL licence [bsc#1118754]
|
||||
rm -rf storage/tokudb/PerconaFT
|
||||
|
||||
%build
|
||||
EXTRA_FLAGS="-Wno-unused-but-set-variable -fno-strict-aliasing -Wno-unused-parameter"
|
||||
# Mariadb devs seems to fall in love with -Werror option
|
||||
@ -394,13 +398,13 @@ export CXXFLAGS="$CFLAGS -felide-constructors"
|
||||
-DWITH_INNOBASE_STORAGE_ENGINE=1 \
|
||||
-DWITH_PERFSCHEMA_STORAGE_ENGINE=1 \
|
||||
%if 0%{with_oqgraph} < 1
|
||||
-DWITHOUT_OQGRAPH=ON \
|
||||
-DPLUGIN_OQGRAPH=NO \
|
||||
%endif
|
||||
%if 0%{with_tokudb} < 1
|
||||
-DWITHOUT_TOKUDB=ON \
|
||||
-DPLUGIN_TOKUDB=NO \
|
||||
%endif
|
||||
%if 0%{with_mroonga} < 1
|
||||
-DWITHOUT_MROONGA=ON \
|
||||
-DPLUGIN_MROONGA=NO \
|
||||
%endif
|
||||
-DWITH_XTRADB_STORAGE_ENGINE=1 \
|
||||
-DWITH_CSV_STORAGE_ENGINE=1 \
|
||||
|
Loading…
Reference in New Issue
Block a user