mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
6e4e097bc2
This corrects build failures on ppc64{,le} with the
WITH_EMBEDDED_SERVER option enabled.
MDEV-22641 added an unusual case in which the same object
file in was included twice with a different function
defination. The original cmake/merge_archives_unix.cmake
did not tolerate such eventualities.
So we move to the highest voted answer on Stack Overflow
for the merging of static libraries.
https://stackoverflow.com/questions/3821916/how-to-merge-two-ar-static-libraries-into-one
Thin archives generated compile failures and the libtool
mechanism would of been another dependency and using .la
files that isn't part of a normal cmake output. The straight
Apple mechanism of libtool with static archives also failed
on Linux.
This leaves the MRI script mechansim which was implemented
in this change.
629 lines
13 KiB
Text
629 lines
13 KiB
Text
*-t
|
|
*.ctest
|
|
*.reject
|
|
*.spec
|
|
*.bak
|
|
*.dgcov
|
|
*.rpm
|
|
.*.swp
|
|
*.ninja
|
|
.ninja_*
|
|
*.mri
|
|
*.mri.tpl
|
|
.gdb_history
|
|
.vs/
|
|
errmsg.sys
|
|
typescript
|
|
_CPack_Packages
|
|
CMakeCache.txt
|
|
CMakeFiles/
|
|
MakeFile
|
|
install_manifest*.txt
|
|
CPackConfig.cmake
|
|
CPackSourceConfig.cmake
|
|
CTestTestfile.cmake
|
|
Docs/INFO_BIN
|
|
Docs/INFO_SRC
|
|
Makefile
|
|
TAGS
|
|
Testing/
|
|
tmp/
|
|
VERSION.dep
|
|
configure
|
|
client/async_example
|
|
client/mysql
|
|
client/mysql_plugin
|
|
client/mysql_upgrade
|
|
client/mysqladmin
|
|
client/mysqlbinlog
|
|
client/mysqlcheck
|
|
client/mysqldump
|
|
client/mysqlimport
|
|
client/mysqlshow
|
|
client/mysqlslap
|
|
client/mysqltest
|
|
client/mariadb-conv
|
|
cmake_install.cmake
|
|
dbug/*.r
|
|
dbug/factorial
|
|
dbug/tests
|
|
dbug/user.ps
|
|
dbug/user.t
|
|
extra/comp_err
|
|
extra/innochecksum
|
|
extra/jemalloc/build/
|
|
extra/jemalloc/tmp/
|
|
extra/mariabackup/mariabackup
|
|
extra/mariabackup/mbstream
|
|
extra/my_print_defaults
|
|
extra/mysql_waitpid
|
|
extra/mysqld_safe_helper
|
|
extra/perror
|
|
extra/replace
|
|
extra/resolve_stack_dump
|
|
extra/resolveip
|
|
extra/wolfssl/user_settings.h
|
|
import_executables.cmake
|
|
include/*.h.tmp
|
|
include/config.h
|
|
include/my_config.h
|
|
include/mysql_version.h
|
|
include/mysqld_ername.h
|
|
include/mysqld_error.h
|
|
include/sql_state.h
|
|
include/probes_mysql.d
|
|
include/probes_mysql_dtrace.h
|
|
include/probes_mysql_nodtrace.h
|
|
include/source_revision.h
|
|
info_macros.cmake
|
|
libmysql*/libmysql*_exports_file.cc
|
|
libmysql*/merge_archives_mysql*.cmake
|
|
libmysql*/mysql*_depends.c
|
|
libmysql/libmysql_versions.ld
|
|
libmysqld/examples/mysql_client_test_embedded
|
|
libmysqld/examples/mysql_embedded
|
|
libmysqld/examples/mysqltest_embedded
|
|
make_dist.cmake
|
|
mariadb-*.*.*.tar.gz
|
|
mariadb-*.*.*/
|
|
mysql-test/lib/My/SafeProcess/my_safe_process
|
|
mysql-test/lib/My/SafeProcess/wsrep_check_version
|
|
mysql-test/mtr
|
|
mysql-test/mysql-test-run
|
|
mysql-test/var*
|
|
mysql-test-gcov.err
|
|
mysql-test-gcov.msg
|
|
mysys/test_hash
|
|
mysys/thr_lock
|
|
mysys/thr_timer
|
|
packaging/rpm-oel/mysql.spec
|
|
packaging/rpm-uln/mysql.10.0.11.spec
|
|
packaging/solaris/postinstall-solaris
|
|
extra/pcre2
|
|
plugin/auth_pam/auth_pam_tool
|
|
plugin/aws_key_management/aws-sdk-cpp
|
|
plugin/aws_key_management/aws_sdk_cpp
|
|
plugin/aws_key_management/aws_sdk_cpp-prefix
|
|
scripts/comp_sql
|
|
scripts/make_binary_distribution
|
|
scripts/msql2mysql
|
|
scripts/mysql_config
|
|
scripts/mysql_config.pl
|
|
scripts/mysql_convert_table_format
|
|
scripts/mysql_find_rows
|
|
scripts/mysql_fix_extensions
|
|
scripts/mysql_fix_privilege_tables.sql
|
|
scripts/mysql_fix_privilege_tables_sql.c
|
|
scripts/mysql_install_db
|
|
scripts/mysql_secure_installation
|
|
scripts/mysql_setpermission
|
|
scripts/mysql_zap
|
|
scripts/mysqlaccess
|
|
scripts/mysqlbug
|
|
scripts/mysqld_multi
|
|
scripts/mysqld_safe
|
|
scripts/mysqldumpslow
|
|
scripts/mysqlhotcopy
|
|
scripts/mytop
|
|
scripts/wsrep_sst_common
|
|
scripts/wsrep_sst_mysqldump
|
|
scripts/wsrep_sst_rsync
|
|
scripts/wsrep_sst_rsync_wan
|
|
scripts/wsrep_sst_mariabackup
|
|
scripts/wsrep_sst_xtrabackup
|
|
scripts/wsrep_sst_xtrabackup-v2
|
|
scripts/maria_add_gis_sp.sql
|
|
scripts/maria_add_gis_sp_bootstrap.sql
|
|
scripts/galera_new_cluster
|
|
scripts/galera_recovery
|
|
scripts/mysql_convert_table_format.pl
|
|
scripts/mysqld_multi.pl
|
|
scripts/mysqldumpslow.pl
|
|
scripts/mysqlhotcopy.pl
|
|
sql-bench/bench-count-distinct
|
|
sql-bench/bench-init.pl
|
|
sql-bench/compare-results
|
|
sql-bench/copy-db
|
|
sql-bench/crash-me
|
|
sql-bench/graph-compare-results
|
|
sql-bench/innotest1
|
|
sql-bench/innotest1a
|
|
sql-bench/innotest1b
|
|
sql-bench/innotest2
|
|
sql-bench/innotest2a
|
|
sql-bench/innotest2b
|
|
sql-bench/run-all-tests
|
|
sql-bench/server-cfg
|
|
sql-bench/test-ATIS
|
|
sql-bench/test-alter-table
|
|
sql-bench/test-big-tables
|
|
sql-bench/test-connect
|
|
sql-bench/test-create
|
|
sql-bench/test-insert
|
|
sql-bench/test-select
|
|
sql-bench/test-table-elimination
|
|
sql-bench/test-transactions
|
|
sql-bench/test-wisconsin
|
|
sql-bench/bench-count-distinct.pl
|
|
sql-bench/compare-results.pl
|
|
sql-bench/copy-db.pl
|
|
sql-bench/crash-me.pl
|
|
sql-bench/graph-compare-results.pl
|
|
sql-bench/innotest1.pl
|
|
sql-bench/innotest1a.pl
|
|
sql-bench/innotest1b.pl
|
|
sql-bench/innotest2.pl
|
|
sql-bench/innotest2a.pl
|
|
sql-bench/innotest2b.pl
|
|
sql-bench/run-all-tests.pl
|
|
sql-bench/server-cfg.pl
|
|
sql-bench/test-ATIS.pl
|
|
sql-bench/test-alter-table.pl
|
|
sql-bench/test-big-tables.pl
|
|
sql-bench/test-connect.pl
|
|
sql-bench/test-create.pl
|
|
sql-bench/test-insert.pl
|
|
sql-bench/test-select.pl
|
|
sql-bench/test-table-elimination.pl
|
|
sql-bench/test-transactions.pl
|
|
sql-bench/test-wisconsin.pl
|
|
sql/make_mysqld_lib.cmake
|
|
sql/lex_token.h
|
|
sql/gen_lex_token
|
|
sql/gen_lex_hash
|
|
sql/lex_hash.h
|
|
sql/mysql_tzinfo_to_sql
|
|
sql/mysqld
|
|
sql/sql_builtin.cc
|
|
sql/sql_yacc.cc
|
|
sql/sql_yacc.hh
|
|
sql/sql_yacc_ora.cc
|
|
sql/sql_yacc_ora.hh
|
|
sql/sql_yacc_ora.yy
|
|
storage/heap/hp_test1
|
|
storage/heap/hp_test2
|
|
storage/maria/aria_chk
|
|
storage/maria/aria_dump_log
|
|
storage/maria/aria_ftdump
|
|
storage/maria/aria_pack
|
|
storage/maria/aria_read_log
|
|
storage/maria/aria_s3_copy
|
|
storage/maria/ma_rt_test
|
|
storage/maria/ma_sp_test
|
|
storage/maria/ma_test1
|
|
storage/maria/ma_test2
|
|
storage/maria/ma_test3
|
|
storage/maria/test_ma_backup
|
|
storage/myisam/mi_test1
|
|
storage/myisam/mi_test2
|
|
storage/myisam/mi_test3
|
|
storage/myisam/myisam_ftdump
|
|
storage/myisam/myisamchk
|
|
storage/myisam/myisamlog
|
|
storage/myisam/myisampack
|
|
storage/myisam/rt_test
|
|
storage/myisam/sp_test
|
|
storage/perfschema/pfs_config.h
|
|
storage/rocksdb/ldb
|
|
storage/rocksdb/myrocks_hotbackup
|
|
storage/rocksdb/mysql_ldb
|
|
storage/rocksdb/myrocks_hotbackup
|
|
storage/rocksdb/rdb_source_revision.h
|
|
storage/rocksdb/sst_dump
|
|
storage/tokudb/PerconaFT/buildheader/db.h
|
|
storage/tokudb/PerconaFT/buildheader/make_tdb
|
|
storage/tokudb/PerconaFT/buildheader/runcat.sh
|
|
storage/tokudb/PerconaFT/ft/log_code.cc
|
|
storage/tokudb/PerconaFT/ft/log_header.h
|
|
storage/tokudb/PerconaFT/ft/log_print.cc
|
|
storage/tokudb/PerconaFT/ft/logformat
|
|
storage/tokudb/PerconaFT/ft/ftverify
|
|
storage/tokudb/PerconaFT/ft/tdb-recover
|
|
storage/tokudb/PerconaFT/ft/tokuftdump
|
|
storage/tokudb/PerconaFT/portability/merge_archives_tokuportability_static.cmake
|
|
storage/tokudb/PerconaFT/portability/toku_config.h
|
|
storage/tokudb/PerconaFT/portability/tokuportability_static_depends.cc
|
|
storage/tokudb/PerconaFT/snappy/
|
|
storage/tokudb/PerconaFT/src/merge_archives_tokufractaltree_static.cmake
|
|
storage/tokudb/PerconaFT/src/tokufractaltree_static_depends.cc
|
|
storage/tokudb/PerconaFT/toku_include/toku_config.h
|
|
storage/tokudb/PerconaFT/tools/ba_replay
|
|
storage/tokudb/PerconaFT/tools/ftverify
|
|
storage/tokudb/PerconaFT/tools/tdb-recover
|
|
storage/tokudb/PerconaFT/tools/tokudb_dump
|
|
storage/tokudb/PerconaFT/tools/tokudb_gen
|
|
storage/tokudb/PerconaFT/tools/tokudb_load
|
|
storage/tokudb/PerconaFT/tools/tokuftdump
|
|
storage/tokudb/PerconaFT/tools/tokuft_logprint
|
|
storage/tokudb/PerconaFT/xz/
|
|
storage/tokudb/tokudb.cnf
|
|
storage/tokudb/tokudb.conf
|
|
strings/conf_to_src
|
|
support-files/MySQL-shared-compat.spec
|
|
support-files/binary-configure
|
|
support-files/config.huge.ini
|
|
support-files/config.medium.ini
|
|
support-files/config.small.ini
|
|
support-files/mariadb.pc
|
|
support-files/mariadb.pp
|
|
support-files/mariadb.service
|
|
support-files/mariadb@.service
|
|
support-files/my-huge.cnf
|
|
support-files/my-innodb-heavy-4G.cnf
|
|
support-files/my-large.cnf
|
|
support-files/my-medium.cnf
|
|
support-files/my-small.cnf
|
|
support-files/mysql-log-rotate
|
|
support-files/mysql.10.0.11.spec
|
|
support-files/mysql.server
|
|
support-files/mysql.service
|
|
support-files/mysql.spec
|
|
support-files/mysqld.service
|
|
support-files/mysqld_multi.server
|
|
support-files/policy/selinux/mysqld-safe.pp
|
|
support-files/sysusers.conf
|
|
support-files/tmpfiles.conf
|
|
support-files/wsrep.cnf
|
|
support-files/wsrep_notify
|
|
tags
|
|
tests/async_queries
|
|
tests/bug25714
|
|
tests/mysql_client_test
|
|
storage/mroonga/config.sh
|
|
storage/mroonga/mrn_version.h
|
|
storage/mroonga/data/install.sql
|
|
storage/mroonga/vendor/groonga/config.h
|
|
storage/mroonga/vendor/groonga/config.sh
|
|
storage/mroonga/vendor/groonga/groonga.pc
|
|
storage/mroonga/vendor/groonga/src/grnslap
|
|
storage/mroonga/vendor/groonga/src/groonga
|
|
storage/mroonga/vendor/groonga/src/groonga-benchmark
|
|
storage/mroonga/vendor/groonga/src/suggest/groonga-suggest-create-dataset
|
|
storage/mroonga/mysql-test/mroonga/storage/r/information_schema_plugins.result
|
|
storage/mroonga/mysql-test/mroonga/storage/r/variable_version.result
|
|
zlib/zconf.h
|
|
xxx/*
|
|
yyy/*
|
|
zzz/*
|
|
|
|
# C and C++
|
|
|
|
# Compiled Object files
|
|
*.slo
|
|
*.o
|
|
*.ko
|
|
*.obj
|
|
*.elf
|
|
*.exp
|
|
*.dep
|
|
*.idb
|
|
*.res
|
|
*.tlog
|
|
|
|
# Precompiled Headers
|
|
*.gch
|
|
*.pch
|
|
|
|
# Compiled Static libraries
|
|
*.lib
|
|
*.a
|
|
*.la
|
|
*.lai
|
|
*.lo
|
|
|
|
# Compiled Dynamic libraries
|
|
*.so
|
|
*.so.*
|
|
*.dylib
|
|
*.dll
|
|
|
|
# Executables
|
|
*.exe
|
|
*.out
|
|
*.app
|
|
*.i*86
|
|
*.x86_64
|
|
*.hex
|
|
|
|
|
|
## Ignore Visual Studio temporary files, build results, and
|
|
## files generated by popular Visual Studio add-ons.
|
|
|
|
# User-specific files
|
|
*.suo
|
|
*.user
|
|
*.userosscache
|
|
*.sln.docstates
|
|
*.sln
|
|
|
|
*.vcproj
|
|
*.vcproj.*
|
|
*.vcproj.*.*
|
|
*.vcproj.*.*.*
|
|
*.vcxproj
|
|
*.vcxproj.*
|
|
*.vcxproj.*.*
|
|
*.vcxproj.*.*.*
|
|
|
|
# Build results
|
|
[Dd]ebug/
|
|
[Dd]ebugPublic/
|
|
[Rr]elease/
|
|
[Rr]eleases/
|
|
x64/
|
|
x86/
|
|
build/
|
|
bld/
|
|
[Bb]in/
|
|
[Oo]bj/
|
|
|
|
# Roslyn cache directories
|
|
*.ide/
|
|
|
|
# MSTest test Results
|
|
[Tt]est[Rr]esult*/
|
|
[Bb]uild[Ll]og.*
|
|
|
|
#NUNIT
|
|
*.VisualState.xml
|
|
TestResult.xml
|
|
|
|
# Build Results of an ATL Project
|
|
[Dd]ebugPS/
|
|
[Rr]eleasePS/
|
|
dlldata.c
|
|
|
|
*_i.c
|
|
*_p.c
|
|
*_i.h
|
|
*.ilk
|
|
*.meta
|
|
*.pdb
|
|
*.pgc
|
|
*.pgd
|
|
*.rsp
|
|
*.sbr
|
|
*.tlb
|
|
*.tli
|
|
*.tlh
|
|
*.tmp
|
|
*.tmp_proj
|
|
*.log
|
|
*.vspscc
|
|
*.vssscc
|
|
.builds
|
|
*.pidb
|
|
*.svclog
|
|
*.scc
|
|
|
|
# Chutzpah Test files
|
|
_Chutzpah*
|
|
|
|
# Visual C++ cache files
|
|
ipch/
|
|
*.aps
|
|
*.ncb
|
|
*.opensdf
|
|
*.sdf
|
|
*.cachefile
|
|
|
|
# Visual Studio profiler
|
|
*.psess
|
|
*.vsp
|
|
*.vspx
|
|
|
|
# TFS 2012 Local Workspace
|
|
$tf/
|
|
|
|
# Guidance Automation Toolkit
|
|
*.gpState
|
|
|
|
# ReSharper is a .NET coding add-in
|
|
_ReSharper*/
|
|
*.[Rr]e[Ss]harper
|
|
*.DotSettings.user
|
|
|
|
# JustCode is a .NET coding addin-in
|
|
.JustCode
|
|
|
|
# TeamCity is a build add-in
|
|
_TeamCity*
|
|
|
|
# DotCover is a Code Coverage Tool
|
|
*.dotCover
|
|
|
|
# NCrunch
|
|
_NCrunch_*
|
|
.*crunch*.local.xml
|
|
|
|
# MightyMoose
|
|
*.mm.*
|
|
AutoTest.Net/
|
|
|
|
# Web workbench (sass)
|
|
.sass-cache/
|
|
|
|
# Installshield output folder
|
|
[Ee]xpress/
|
|
|
|
# DocProject is a documentation generator add-in
|
|
DocProject/buildhelp/
|
|
DocProject/Help/*.HxT
|
|
DocProject/Help/*.HxC
|
|
DocProject/Help/*.hhc
|
|
DocProject/Help/*.hhk
|
|
DocProject/Help/*.hhp
|
|
DocProject/Help/Html2
|
|
DocProject/Help/html
|
|
|
|
# Click-Once directory
|
|
publish/
|
|
|
|
# Publish Web Output
|
|
*.[Pp]ublish.xml
|
|
*.azurePubxml
|
|
# TODO: Comment the next line if you want to checkin your web deploy settings
|
|
# but database connection strings (with potential passwords) will be unencrypted
|
|
*.pubxml
|
|
*.publishproj
|
|
|
|
# NuGet Packages
|
|
*.nupkg
|
|
# The packages folder can be ignored because of Package Restore
|
|
**/packages/*
|
|
# except build/, which is used as an MSBuild target.
|
|
!**/packages/build/
|
|
# If using the old MSBuild-Integrated Package Restore, uncomment this:
|
|
#!**/packages/repositories.config
|
|
|
|
# Windows Azure Build Output
|
|
csx/
|
|
*.build.csdef
|
|
|
|
# Windows Store app package directory
|
|
AppPackages/
|
|
|
|
# Others
|
|
# sql/
|
|
*.Cache
|
|
ClientBin/
|
|
[Ss]tyle[Cc]op.*
|
|
~$*
|
|
*~
|
|
*.dbmdl
|
|
*.dbproj.schemaview
|
|
*.pfx
|
|
*.publishsettings
|
|
node_modules/
|
|
|
|
# RIA/Silverlight projects
|
|
Generated_Code/
|
|
|
|
# Backup & report files from converting an old project file
|
|
# to a newer Visual Studio version. Backup files are not needed,
|
|
# because we have git ;-)
|
|
_UpgradeReport_Files/
|
|
Backup*/
|
|
UpgradeLog*.XML
|
|
UpgradeLog*.htm
|
|
|
|
# SQL Server files
|
|
*.mdf
|
|
*.ldf
|
|
|
|
# Business Intelligence projects
|
|
*.rdl.data
|
|
*.bim.layout
|
|
*.bim_*.settings
|
|
|
|
# Microsoft Fakes
|
|
FakesAssemblies/
|
|
|
|
# macOS garbage
|
|
.DS_Store
|
|
|
|
# QtCreator && CodeBlocks
|
|
*.cbp
|
|
|
|
compile_commands.json
|
|
.clang-format
|
|
.kscope/
|
|
.vimrc
|
|
.editorconfig
|
|
.kateconfig
|
|
*.kdev4
|
|
|
|
# Visual Studio Code workspace
|
|
.vscode/
|
|
|
|
# Clion && other JetBrains ides
|
|
.idea
|
|
|
|
client/mariadb
|
|
client/mariadb-admin
|
|
client/mariadb-binlog
|
|
client/mariadb-check
|
|
client/mariadb-dump
|
|
client/mariadb-import
|
|
client/mariadb-plugin
|
|
client/mariadb-show
|
|
client/mariadb-slap
|
|
client/mariadb-test
|
|
client/mariadb-upgrade
|
|
extra/mariabackup/mariadb-backup
|
|
extra/mariadbd-safe-helper
|
|
extra/mariadb-waitpid
|
|
libmysqld/examples/mariadb-client-test-embedded
|
|
libmysqld/examples/mariadb-embedded
|
|
libmysqld/examples/mariadb-test-embedded
|
|
man/mariadb.1
|
|
man/mariadb-access.1
|
|
man/mariadb-admin.1
|
|
man/mariadb-backup.1
|
|
man/mariadb-binlog.1
|
|
man/mariadb-check.1
|
|
man/mariadb-client-test.1
|
|
man/mariadb-client-test-embedded.1
|
|
man/mariadb_config.1
|
|
man/mariadb-convert-table-format.1
|
|
man/mariadbd.8
|
|
man/mariadbd-multi.1
|
|
man/mariadbd-safe.1
|
|
man/mariadbd-safe-helper.1
|
|
man/mariadb-dump.1
|
|
man/mariadb-dumpslow.1
|
|
man/mariadb-embedded.1
|
|
man/mariadb-find-rows.1
|
|
man/mariadb-fix-extensions.1
|
|
man/mariadb-hotcopy.1
|
|
man/mariadb-import.1
|
|
man/mariadb-install-db.1
|
|
man/mariadb-ldb.1
|
|
man/mariadb-plugin.1
|
|
man/mariadb-secure-installation.1
|
|
man/mariadb-setpermission.1
|
|
man/mariadb-show.1
|
|
man/mariadb-slap.1
|
|
man/mariadb-test.1
|
|
man/mariadb-test-embedded.1
|
|
man/mariadb-tzinfo-to-sql.1
|
|
man/mariadb-upgrade.1
|
|
man/mariadb-waitpid.1
|
|
scripts/mariadb-access
|
|
scripts/mariadb-convert-table-format
|
|
scripts/mariadbd-multi
|
|
scripts/mariadbd-safe
|
|
scripts/mariadb-dumpslow
|
|
scripts/mariadb-find-rows
|
|
scripts/mariadb-fix-extensions
|
|
scripts/mariadb-hotcopy
|
|
scripts/mariadb-install-db
|
|
scripts/mariadb-secure-installation
|
|
scripts/mariadb-setpermission
|
|
sql/mariadbd
|
|
sql/mariadb-tzinfo-to-sql
|
|
storage/rocksdb/mariadb-ldb
|
|
tests/mariadb-client-test
|
|
versioninfo_dll.rc
|
|
versioninfo_exe.rc
|
|
win/packaging/ca/symlinks.cc
|