diff options
| author | Peter Seiderer <ps.report@gmx.net> | 2018-10-07 19:06:37 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@bootlin.com> | 2018-10-08 10:18:29 +0200 |
| commit | 2b82e014b40a60dc4350d135ee61b2652df1caeb (patch) | |
| tree | c1960561d8d85108ce496ac400fea1d630924eae /package/mysql/Config.in | |
| parent | e7956757c11a8eb6aa6c4d27fcf7fa55aee60c2d (diff) | |
| download | buildroot-2b82e014b40a60dc4350d135ee61b2652df1caeb.tar.gz buildroot-2b82e014b40a60dc4350d135ee61b2652df1caeb.zip | |
package/mariadb: bump version to 10.3.10
Release notes:
https://mariadb.com/kb/en/library/mariadb-10310-release-notes/
Changelog: https://mariadb.com/kb/en/mariadb-10310-changelog/
This bump also fixes broken atomic support for
BR2_TOOLCHAIN_HAS_LIBATOMIC=y with mariadb-10.2:
[ 59%] Linking CXX executable mariabackup
../../storage/innobase/libinnobase.a(handler0alter.cc.o): In function `my_atomic_add64':
/home/bernd/buildroot/output/build/mariadb-10.2.17/include/my_atomic.h:274:
undefined reference to `__sync_fetch_and_add_8'
with this defconfig
BR2_arcle=y
BR2_archs38=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arcle-hs38-full-2018.02-926-gb393c24.tar.bz2"
BR2_TOOLCHAIN_EXTERNAL_GCC_7=y
BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_1=y
BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
BR2_TOOLCHAIN_EXTERNAL_CXX=y
BR2_PACKAGE_MYSQL=y
BR2_PACKAGE_MARIADB=y
BR2_PACKAGE_MARIADB_SERVER=y
Adding "-latomic" to CXXFLAGS and/or adding -DHAVE_GCC_ATOMIC_BUILTINS=1
to CONF_OPTS, like we do for mariadb-10.3, does not fix the build error
with mariadb-10.2. There the build would stop even earlier without these
options:
/home/bernd/buildroot/output/build/mariadb-10.2.17/include/my_atomic.h:138:2:
error: #error atomic ops for this platform are not implemented
#error atomic ops for this platform are not implemented
Mariadb-10.3 contains improved atomic support, this build error does
not occur here.
Updated license hash of README.md after upstream commits:
https://github.com/MariaDB/server/commits/10.3/README.md
my-small.cnf.sh is not provided anymore by upstream:
https://github.com/MariaDB/server/commit/7fee164faf8fce7be4ebe322d2178efd3d075eae
[Peter Seiderer: bumped to version 10.3.7]
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
[Bernd: bumped to version 10.3.10, fixed atomic support,
fixed my-small.cnf.sh, updated license hash]
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Diffstat (limited to 'package/mysql/Config.in')
| -rw-r--r-- | package/mysql/Config.in | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/package/mysql/Config.in b/package/mysql/Config.in index ccc014e272..6409c8b806 100644 --- a/package/mysql/Config.in +++ b/package/mysql/Config.in @@ -17,6 +17,7 @@ choice config BR2_PACKAGE_MARIADB bool "mariadb" depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8 select BR2_PACKAGE_LIBAIO select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_NCURSES @@ -32,6 +33,7 @@ config BR2_PACKAGE_MARIADB comment "mariadb needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8 config BR2_PACKAGE_ORACLE_MYSQL bool "oracle mysql" |
