summaryrefslogtreecommitdiff
path: root/cmake
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | * MDEV-23114 AUTH_PAM plugin can not be disabled when using mysql_release configVicențiu Ciorbaru2020-07-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | When setting the PLUGIN_AUTH_PAM variable, mark it as a "CACHE" variable so it can be overridden by the user.
* | | | | Merge 10.4 into 10.5Marko Mäkelä2020-07-024-10/+7
|\ \ \ \ \ | |/ / / /
| * | | | Merge 10.3 into 10.4Marko Mäkelä2020-07-024-10/+7
| |\ \ \ \ | | |/ / /
| | * | | Merge 10.2 into 10.3Marko Mäkelä2020-07-022-2/+3
| | |\ \ \ | | | |/ /
| | | * | Merge 10.1 into 10.2bb-10.2-mergeMarko Mäkelä2020-07-012-2/+3
| | | |\ \ | | | | |/
| | | | * mtr: use env for perlDaniel Black2020-06-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On FreeBSD, perl isn't in /usr/bin, its in /usr/local/bin or elsewhere in the path. Like storage/{maria/unittest/,}ma_test_* , we use /usr/bin/env to find perl and run it.
| | | | * Disable dtrace probes on Windows.Vladislav Vaintroub2020-06-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Apparently, in Win10, dtrace is avaialable, but it does not work with MariaDB user probes
| | * | | make rocksdb cmake checks less verbose on repeatSergei Golubchik2020-07-012-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fix FindLZ4 to follow convention (LIBRARIES, not LIBRARY) * remove redundant checks from rocksdb/CMakeLists.txt * put all checks through the same macro that uniformly checks for a package, prints the message, adds definition
| | * | | Fix RocksDB detection of ZSTDOtto Kekäläinen2020-07-011-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The library finder needs to have capitals in its name so that FIND_PACKAGE will load the correct finder and actually detect that libzstd is available. Without this change the CMake would just always silently skip ZSTD since it would never find it. Simplify Debian autopkgtest RocksDB part and make it more verbose so that future regressions like this are easier to debug. Also remove QUIET from the RocksDB FIND_PACKAGE call so that it is easier to read in build logs what libraries were detected. Also add missing underscores to error messages.
| * | | | Revert "Fix cross-compilation for systemd files"Otto Kekäläinen2020-06-271-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9fff91b59bc9ce22c77164f0129a765e3be3e9f3 which was pushed on master by accident.
| * | | | Fix cross-compilation for systemd filesOtto Kekäläinen2020-06-271-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upstreamed from https://salsa.debian.org/mariadb-team/mariadb-10.4/-/blob/master/debian/patches/930314-cross-build.patch which has been running in Debian successfully for a year now. Original bug report: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=930314
* | | | | always use python3Sergei Golubchik2020-07-012-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | because columnstore uses python3, so rocksdb can be picky too. python3 is present in all supported distros. and python2 is obsolete anyway.
* | | | | Add stub for building ColumnStoreAndrew Hutchings2020-06-191-0/+8
| | | | |
* | | | | Windows, compiling - use /diagnostics:caret flag, for better diagnosticsVladislav Vaintroub2020-06-191-0/+2
| | | | |
* | | | | INSTALL_UNIX_ADDRDIR for debian to /run/mysqld/mysqld.sockDaniel Black2020-06-181-1/+1
| | | | |
* | | | | libutils: merge_archives_unixDaniel Black2020-06-182-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MRI scripts cannot handle + in paths, and ubuntu CI makes use of these. So we remove the top level build dir from the script and transform it into a relative path script.
* | | | | libutils: merge static libraries only onceDaniel Black2020-06-181-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because of common dependencies between the static libraries list can contain duplicates. We reduce these down to the single last one in the list. This reduces the relative time of a rebuild from: $ (cd builddir/; time make -j) ... real 0m30.789s user 1m33.477s sys 0m19.678s and the LIB entries $ grep ADDLIB builddir/libmysqld/mysqlserver-\$\<CONFIG\>.mri.tpl | wc -l 179 $ du -h builddir/libmysqld/libmariadbd.a 4.1G builddir/libmysqld/libmariadbd.a To: $ (cd builddir/; time make -j) ... real 0m20.139s user 1m32.423s sys 0m12.208s $ grep ADDLIB builddir/libmysqld/mysqlserver-\$\<CONFIG\>.mri.tpl | wc -l 25 $ du -h builddir/libmysqld/libmariadbd.a 688M builddir/libmysqld/libmariadbd.a
* | | | | Fix error in cmake, when trying gcc on Windows.Vladislav Vaintroub2020-06-181-1/+1
| | | | |
* | | | | post-fix for #1504Sergei Golubchik2020-06-122-2/+4
| | | | |
* | | | | MDEV-22812 "failed to create symbolic link" during the buildSergei Golubchik2020-06-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as cmake manual says If a sequential execution of multiple commands is required, use multiple ``execute_process()`` calls with a single ``COMMAND`` argument.
* | | | | MDEV-22864: cmake/libutils account for cmake-2.8.12.1Daniel Black2020-06-111-3/+2
| | | | | | | | | | | | | | | | | | | | That doesn't support STRING(APPEND ..)
* | | | | cmake: merge_static_libs - correct duplicate assumptions (#1583)Daniel Black2020-06-102-47/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge 10.4 into 10.5Marko Mäkelä2020-06-031-0/+8
|\ \ \ \ \ | |/ / / /
| * | | | Merge 10.3 into 10.4Marko Mäkelä2020-06-031-0/+8
| |\ \ \ \ | | |/ / /
| | * | | Merge 10.2 into 10.3Marko Mäkelä2020-06-021-0/+8
| | |\ \ \ | | | |/ /
| | | * | cmake: quieterSergei Golubchik2020-05-311-0/+8
| | | | |
* | | | | MDEV-22641: Provide SIMD optimized wrapper for zlib crc32() (#1558)mysqlonarm2020-06-011-36/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Existing implementation used my_checksum (from mysys) for calculating table checksum and binlog checksum. This implementation was optimized for powerpc only and lacked SIMD implementation for x86 (using clmul) and ARM (using ACLE) instead used zlib-crc32. mariabackup had its own copy of the crc32 implementation using hardware optimized implementation only for x86 and lagged hardware based implementation for powerpc and ARM. Patch helps unifies all such calls and help aggregate all of them using an unified interface my_checksum(). Said unification also enables hardware optimized calls for all architecture viz. x86, ARM, POWERPC. Default always fallback to zlib crc32. Thanks to Daniel Black for reviewing, fixing and testing PowerPC changes. Thanks to Marko and Daniel for early code feedback.
* | | | | Merge 10.4 into 10.5Marko Mäkelä2020-05-313-3/+5
|\ \ \ \ \ | |/ / / /
| * | | | Merge 10.3 into 10.4Marko Mäkelä2020-05-303-3/+5
| |\ \ \ \ | | |/ / /
| | * | | Merge 10.2 into 10.3Marko Mäkelä2020-05-293-3/+5
| | |\ \ \ | | | |/ /
| | | * | bintars should use bundled PCRESergei Golubchik2020-05-271-0/+1
| | | | |
| | | * | get rid of cmake warningSergei Golubchik2020-05-271-1/+1
| | | | |
| | | * | optimize performance of the build in a fresh cloneSergei Golubchik2020-05-271-2/+2
| | | | | | | | | | | | | | | | | | | | don't fetch the complete history of all submodules, it's rarely needed
| | | * | don't include .git files in source packagesSergei Golubchik2020-05-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | the existing ".git/" rule only filters out .git directories, but as we have submodules now, we have to filter out .git files too.
* | | | | MDEV-22613 Windows - reduce package sizeVladislav Vaintroub2020-05-181-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Liposuction of about 20% package size is achieved by using linker /OPT:REF,ICF and compile option /Gw
* | | | | Windows : small cmake cleanupVladislav Vaintroub2020-05-181-10/+10
| | | | | | | | | | | | | | | | | | | | Use STRING(APPEND VAR...) rather than SET(VAR "${VAR} ..."), it is shorter
* | | | | MDEV-22612 Fix -DWITH_ASAN=1 on Windows.Vladislav Vaintroub2020-05-182-27/+45
| | | | |
* | | | | Merge branch '10.4' into 10.5Sergei Golubchik2020-05-092-4/+35
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '10.3' into 10.4Sergei Golubchik2020-05-092-4/+35
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '10.2' into 10.3mariadb-10.3.23Sergei Golubchik2020-05-091-0/+8
| | |\ \ \ | | | |/ /
| | | * | Merge branch '10.1' into 10.2mariadb-10.2.32Oleksandr Byelkin2020-05-081-0/+8
| | | |\ \ | | | | |/
| | | | * MDEV-21437 MariaDB's SUSE/SLES packages don't "provide" all of the same ↵Sergei Golubchik2020-05-051-0/+8
| | | | | | | | | | | | | | | | | | | | capabilities as the platform's default packages
| | * | | MDEV-22123 On RHEL8 mariadb-server is not providedSergei Golubchik2020-05-092-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setup alternative name for rhel8/centos8 use correct C/C version when providing mariadb-connector-c and other changes for installation over distro packages to work: dnf install mariadb-server dnf install --allowerasing MariaDB-{server,common,client,shared}*.rpm
* | | | | MDEV-22454 Allow -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ONVladislav Vaintroub2020-05-041-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable IPO (interprocedural optimization, aka /GL) on Windows on libraries, from which server.dll exports symbols - exporting symbols does not work for objects compiled with /GL.
* | | | | Merge 10.4 into 10.5Marko Mäkelä2020-04-291-0/+4
|\ \ \ \ \ | |/ / / /
| * | | | Merge 10.3 into 10.4Marko Mäkelä2020-04-291-0/+4
| |\ \ \ \ | | |/ / /
| | * | | Merge 10.2 into 10.3Marko Mäkelä2020-04-281-0/+4
| | |\ \ \ | | | |/ /
| | | * | MDEV-21913 Add pam_user_map.so file to binary tarball packageSergei Golubchik2020-04-281-0/+4
| | | | |
| | | * | Merge 10.1 into 10.2Marko Mäkelä2020-04-271-7/+3
| | | |\ \ | | | | |/
| | | | * MDEV-22078 MariaDB-compat missing from MariaDB 10.4 CentOS 8 Yum RepoSergei Golubchik2020-04-271-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport INSALL_SYMLINK cmake macro from 10.3. It'll make libmysqlclient_r.* symlinks to link to the actual shared library file, not to another symlink. As a bonus it'll fix cmake warning about deprecated LOCATION property