summaryrefslogtreecommitdiff
path: root/cmake
Commit message (Collapse)AuthorAgeFilesLines
* Merge 10.3 into 10.4Marko Mäkelä2021-03-311-0/+1
|\
| * Merge 10.2 into 10.3Marko Mäkelä2021-03-311-0/+1
| |\
| | * Windows - suppress nonsensical(for this OS) system check.Vladislav Vaintroub2021-03-301-0/+1
| | | | | | | | | | | | Amends 48141f3c1787de941d969ad1e6675611b2b650c2
* | | Merge 10.3 into 10.4Marko Mäkelä2021-03-191-1/+1
|\ \ \ | |/ /
| * | Merge 10.2 into 10.3Marko Mäkelä2021-03-181-1/+1
| |\ \ | | |/
| | * MDEV-24554 Windows authenticode signing stopped workingVladislav Vaintroub2021-03-161-1/+1
| | | | | | | | | | | | | | | Change the default timestamping URL, again http://timestamp.globalsign.com/?signature=sha2 seems to work fine atm
* | | Merge branch '10.3' into 10.4Vicențiu Ciorbaru2021-02-231-0/+7
|\ \ \ | |/ /
| * | Merge branch '10.2' into 10.3Vicențiu Ciorbaru2021-02-231-0/+7
| |\ \ | | |/
| | * Remove race condition during `make dist`Vicențiu Ciorbaru2021-02-231-0/+7
| | | | | | | | | | | | | | | | | | | | | Introduced by 85828b8f22e7f4dfa6a5d4b0a1ab9e133e7feea7 This is running 2 git processes in parallel, which, if unlucky can cause either of them to fail with "File already exists" error.
* | | Merge 10.3 into 10.4Marko Mäkelä2021-01-111-1/+1
|\ \ \ | |/ /
| * | Merge 10.2 into 10.3 (except MDEV-17556)Marko Mäkelä2021-01-111-1/+1
| |\ \ | | |/ | | | | | | | | | | | | The fix of MDEV-17556 (commit e25623e78a3efde05e30070dc7362f8dc0d8c459 and commit 61a362c9493df63dc588fcb71409537ae56ab9c8) has been omitted due to conflicts and will have to be applied separately later.
| | * MDEV-24554 Do not use verisign server for authenticode timestampingVladislav Vaintroub2021-01-091-1/+1
| | |
* | | Merge 10.3 into 10.4Marko Mäkelä2020-11-031-19/+23
|\ \ \ | |/ /
| * | Merge 10.2 into 10.3Marko Mäkelä2020-11-021-19/+23
| |\ \ | | |/
| | * Fix RPM packaging on cmake 3.18+Sergei Golubchik2020-10-301-19/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | cmake has caught up and since version 3.18 it started supporting CPACK_RPM_POST_TRANS_SCRIPT_FILE, something we've supported for two years and cmake 2.8.11. Both implementation add %posttrans tag and rpmbuild gets confused. Disable our implementation for cmake 3.18+
* | | Merge 10.3 into 10.4Marko Mäkelä2020-10-292-2/+2
|\ \ \ | |/ /
| * | cleanup: use predefined CMAKE_DL_LIBSSergei Golubchik2020-10-232-2/+2
| | | | | | | | | | | | instead of, say, MY_SEARCH_LIBS(dlopen dl LIBDL)
* | | Merge 10.3 into 10.4Marko Mäkelä2020-10-221-3/+3
|\ \ \ | |/ /
| * | Merge 10.2 into 10.3Marko Mäkelä2020-10-221-3/+3
| |\ \ | | |/
| | * Merge 10.1 into 10.2Marko Mäkelä2020-10-211-3/+3
| | |\
| | | * MDEV-23887: check_linker_flags correct for old cmake compatibilityDaniel Black2020-10-211-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was only from CMake-3.14.0 that CMAKE_REQUIRED_LINK_OPTIONS was used in CHECK_CXX_SOURCE_COMPILES. Without this, it could be the case (as was on OSX) that a flag was never checked in CHECK_CXX_SOURCE_COMPILES, the CHECK successfully passed, but failed at link time. As such we use CMAKE_REQUIRED_LIBRARIES to include the flags to check as its compatible enough with the cmake versions for non-Windows compilers/linkers. Tested on x86_64 with: * 3.11.4 * 3.17.4 Corrects: 7473e1841c630d86f1873a2a7afacb53955b3f6f In the future: * cmake >=3.14.0 can use CMAKE_REQUIRED_LINK_OPTIONS * cmake >=3.18.0 can use CHECK_LINKER_FLAG (with policy CMP0057 NEW) (e.g: commit c7ac2deff9a2c965887dcc67cbf2a3a7c3e0123d) CMAKE_REQUIRED_LIBRARIES suggested by serg@mariadb.com Reviewed-by: anel@mariadb.org
* | | | Merge branch '10.3' into 10.4Oleksandr Byelkin2020-08-031-1/+0
|\ \ \ \ | |/ / /
| * | | Merge branch '10.2' into 10.3Oleksandr Byelkin2020-08-031-1/+0
| |\ \ \ | | |/ /
| | * | Merge branch '10.1' into 10.2Oleksandr Byelkin2020-08-021-1/+0
| | |\ \ | | | |/
| | | * MDEV-15961: Fix stacktraces under FreeBSD (aarch64)Karthik Kamath2020-07-281-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Largely based on MySQL commit https://github.com/mysql/mysql-server/commit/75271e51d60bce8683423b208cbb43b11ca6060e MySQL Ref: BUG#24566529: BACKPORT BUG#23575445 TO 5.6 (cut) Also, the PTR_SANE macro which tries to check if a pointer is invalid (used when printing pointer values in stack traces) gave false negatives on OSX/FreeBSD. On these platforms we now simply check if the pointer is non-null. This also removes a sbrk() deprecation warning when building on OS X. (It was before only disabled with building using XCode). Removed execinfo path of MySQL patch that was already included. sbrk doesn't exist on FreeBSD aarch64. Removed HAVE_BSS_START based detection and replaced with __linux__ as it doesn't exist on OSX, Solaris or Windows. __bss_start exists on mutiple Linux architectures. Tested on FreeBSD and Linux x86_64. Being in FreeBSD ports for 2 years implies a good testing there on all FreeBSD architectures there too. MySQL-8.0.21 code is functionally identical to original commit.
* | | | Merge 10.3 into 10.4Marko Mäkelä2020-07-201-0/+27
|\ \ \ \ | |/ / /
| * | | Merge 10.2 into 10.3Marko Mäkelä2020-07-201-0/+27
| |\ \ \ | | |/ /
| | * | Merge 10.1 into 10.2Marko Mäkelä2020-07-201-0/+27
| | |\ \ | | | |/
| | | * check_linker_flag: use for linker flagsDaniel Black2020-07-151-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Wl,-z,relro,-z,now are linker flags and should be checked as such. TODO: perform module, exe shared checks separately rather than a pure linker check.
* | | | Merge 10.3 into 10.4Marko Mäkelä2020-07-151-1/+1
|\ \ \ \ | |/ / /
| * | | Merge 10.2 into 10.3Marko Mäkelä2020-07-141-1/+1
| |\ \ \ | | |/ /
| | * | Merge 10.1 into 10.2Marko Mäkelä2020-07-141-1/+1
| | |\ \ | | | |/
| | | * 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.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
* | | | 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
| | | |
* | | | 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
View Lorry Controller Status