Bump Buildroot Version to buildroot 2019_02_6
This commit is contained in:
@@ -3,6 +3,8 @@ From: Ryan Coe <bluemrp9@gmail.com>
|
||||
Date: Thu, 27 Oct 2016 20:33:21 -0700
|
||||
Subject: [PATCH] add extra check for librt
|
||||
|
||||
https://jira.mariadb.org/browse/MDEV-10841
|
||||
|
||||
Signed-off-by: Ryan Coe <bluemrp9@gmail.com>
|
||||
---
|
||||
configure.cmake | 3 +++
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
From c90ae2ca3dff267b9e21595376d22de397f6f78f Mon Sep 17 00:00:00 2001
|
||||
From: Ryan Coe <bluemrp9@gmail.com>
|
||||
Date: Tue, 20 Aug 2019 06:22:43 -0700
|
||||
Subject: [PATCH] Fix build error with newer cmake
|
||||
|
||||
Fixes the following build error:
|
||||
|
||||
CMake Error at cmake/os/Linux.cmake:29 (STRING):
|
||||
STRING sub-command REPLACE requires at least four arguments.
|
||||
Call Stack (most recent call first):
|
||||
CMakeLists.txt:101 (INCLUDE)
|
||||
|
||||
CMake Error at cmake/os/Linux.cmake:29 (STRING):
|
||||
STRING sub-command REPLACE requires at least four arguments.
|
||||
Call Stack (most recent call first):
|
||||
CMakeLists.txt:101 (INCLUDE)
|
||||
|
||||
https://jira.mariadb.org/browse/MDEV-20596
|
||||
|
||||
Signed-off-by: Ryan Coe <bluemrp9@gmail.com>
|
||||
---
|
||||
cmake/os/Linux.cmake | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/cmake/os/Linux.cmake b/cmake/os/Linux.cmake
|
||||
index 50a2b21c838d8d6ca4cacc0704a9be4da3a57a0a..b871586acc9cfaddc3836cc9afafd85969120420 100644
|
||||
--- a/cmake/os/Linux.cmake
|
||||
+++ b/cmake/os/Linux.cmake
|
||||
@@ -26,9 +26,9 @@ SET(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -D_GNU_SOURCE=1)
|
||||
|
||||
# Fix CMake (< 2.8) flags. -rdynamic exports too many symbols.
|
||||
FOREACH(LANG C CXX)
|
||||
- STRING(REPLACE "-rdynamic" ""
|
||||
- CMAKE_SHARED_LIBRARY_LINK_${LANG}_FLAGS
|
||||
- ${CMAKE_SHARED_LIBRARY_LINK_${LANG}_FLAGS}
|
||||
+ STRING(REPLACE "-rdynamic" ""
|
||||
+ "CMAKE_SHARED_LIBRARY_LINK_${LANG}_FLAGS"
|
||||
+ "${CMAKE_SHARED_LIBRARY_LINK_${LANG}_FLAGS}"
|
||||
)
|
||||
ENDFOREACH()
|
||||
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
# From https://downloads.mariadb.org/mariadb/10.3.13
|
||||
md5 603ce42e35b9a688f2cca05275acb5cb mariadb-10.3.13.tar.gz
|
||||
sha1 08467885412184e99b835732913d445fd2c4b1b3 mariadb-10.3.13.tar.gz
|
||||
sha256 b2aa857ef5b84f85a7ea60a1eac7b34c0ca5151c71a0d44ce2d7fb028d71459a mariadb-10.3.13.tar.gz
|
||||
sha512 3cbd93291aa43b235e5b81d953ea69fb32df54fb518f922f69b5485952f01fae693c77b0efac37f414ed7ff132d3b58f899812bdb7be8a5b344c3640e2c3a0dd mariadb-10.3.13.tar.gz
|
||||
# From https://downloads.mariadb.org/mariadb/10.3.17
|
||||
md5 6bcee042bcc393cfcffeccbddbf6fe0e mariadb-10.3.17.tar.gz
|
||||
sha1 16edbd4762c8804118dda10de713cbddc675df5a mariadb-10.3.17.tar.gz
|
||||
sha256 20a1ea4fc59aae89dcc82aff0d4907b036daf9bfbd252f08162399f055097097 mariadb-10.3.17.tar.gz
|
||||
sha512 6fba995d8c284a12f19ee5635f5d69d8fa89fc314f512cd1764b2c4593933baf71a472ddce630463debd3bfbafa1cf5afee3f40d3c4062242f58cea16259561e mariadb-10.3.17.tar.gz
|
||||
|
||||
# Hash for license files
|
||||
sha256 43f4b5b13cecbbdb04a180cbf6c2bd64237819d1a32165b7d475c1b392e6a8d1 README.md
|
||||
sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING
|
||||
sha256 a4665c1189fe31e0bbc27e9b55439df7dad6e99805407fe58d78da7aabe678f8 README.md
|
||||
sha256 240a15a1d0f34d3abca462cdb7e5fb89470967563f16b0e71169e51c1e74cf2b COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
MARIADB_VERSION = 10.3.13
|
||||
MARIADB_VERSION = 10.3.17
|
||||
MARIADB_SITE = https://downloads.mariadb.org/interstitial/mariadb-$(MARIADB_VERSION)/source
|
||||
MARIADB_LICENSE = GPL-2.0 (server), GPL-2.0 with FLOSS exception (GPL client library), LGPL-2.0 (LGPL client library)
|
||||
# Tarball no longer contains LGPL license text
|
||||
@@ -86,7 +86,8 @@ MARIADB_CONF_OPTS += \
|
||||
-DMYSQL_DATADIR=/var/lib/mysql \
|
||||
-DMYSQL_UNIX_ADDR=$(MYSQL_SOCKET)
|
||||
|
||||
HOST_MARIADB_CONF_OPTS += -DWITH_SSL=OFF
|
||||
HOST_MARIADB_DEPENDENCIES = host-openssl
|
||||
HOST_MARIADB_CONF_OPTS += -DWITH_SSL=system
|
||||
|
||||
# Some helpers must be compiled for host in order to crosscompile mariadb for
|
||||
# the target. They are then included by import_executables.cmake which is
|
||||
|
||||
Reference in New Issue
Block a user