[bundled libraries fix] remove unused bundles
This commit is contained in:
parent
15b46299cf
commit
f9c8a7626a
@ -219,6 +219,8 @@ BuildRequires: libfido2-devel
|
||||
Requires: bash coreutils grep
|
||||
Requires: %{pkgname}-common = %{sameevr}
|
||||
|
||||
# 'boost' header files must be bundled
|
||||
# See https://bugzilla.redhat.com/show_bug.cgi?id=2260138#c7 for details
|
||||
Provides: bundled(boost) = %{boost_bundled_version}
|
||||
|
||||
# 'rapidjson' library must be bundled
|
||||
@ -227,6 +229,10 @@ Provides: bundled(boost) = %{boost_bundled_version}
|
||||
# In the MySQL 8.0.34, the MySQL upsstream made the 'rapidjson' library to be bundled by default.
|
||||
Provides: bundled(rapidjson)
|
||||
|
||||
# Not available in Fedora
|
||||
# https://github.com/martinus/unordered_dense
|
||||
Provides: bundled(unordered_dense)
|
||||
|
||||
%{?with_conflicts_mariadb:Conflicts: mariadb}
|
||||
# Explicitly disallow installation of mysql + mariadb-server
|
||||
%{?with_conflicts_mariadb:Conflicts: mariadb-server}
|
||||
@ -471,6 +477,26 @@ pushd boost/boost_$(echo %{boost_bundled_version}| tr . _)
|
||||
%patch -P113 -p2
|
||||
popd
|
||||
|
||||
# Remove bundled code that is unused (all cases in which we use the system version of the library instead)
|
||||
# as required by https://docs.fedoraproject.org/en-US/packaging-guidelines/#bundling
|
||||
rm -r extra/curl
|
||||
rm -r extra/icu
|
||||
rm -r extra/libcbor
|
||||
rm -r extra/libedit
|
||||
rm -r extra/libevent
|
||||
rm -r extra/libfido2
|
||||
rm -r extra/protobuf
|
||||
rm -r extra/tirpc
|
||||
rm -r extra/zlib
|
||||
rm -r extra/zstd
|
||||
# Three files from the lz4 bundle tree are still needed.
|
||||
# They are the 'xxhash' library with custom extension to it.
|
||||
find extra/lz4 -type f ! \( -name 'xxhash.c' -o -name 'xxhash.h' -o -name 'my_xxhash.h' \) -delete
|
||||
# Only used in MySQL Router, which we don't build
|
||||
rm -r extra/duktape
|
||||
# Needed for unit tests (different from MTR tests), which we doesn't run, as they doesn't work on some architectures: #1989847
|
||||
rm -r extra/googletest
|
||||
rm -r extra/abseil
|
||||
|
||||
# generate a list of tests that fail, but are not disabled by upstream
|
||||
cat %{SOURCE50} | tee -a mysql-test/%{skiplist}
|
||||
|
Loading…
Reference in New Issue
Block a user