summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-dbs
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-dbs')
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb.inc1
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-library-LZ4-lookup.patch30
2 files changed, 31 insertions, 0 deletions
diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc
index 1c1b8a0a8..23de69dd2 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb.inc
+++ b/meta-oe/recipes-dbs/mysql/mariadb.inc
@@ -19,6 +19,7 @@ SRC_URI = "https://downloads.mariadb.org/interstitial/${BP}/source/${BP}.tar.gz
19 file://clang_version_header_conflict.patch \ 19 file://clang_version_header_conflict.patch \
20 file://fix-arm-atomic.patch \ 20 file://fix-arm-atomic.patch \
21 file://0001-Fix-build-breakage-from-lock_guard-error-6161.patch \ 21 file://0001-Fix-build-breakage-from-lock_guard-error-6161.patch \
22 file://0001-Fix-library-LZ4-lookup.patch \
22 " 23 "
23SRC_URI[md5sum] = "d0de881ab8ead46928cafb7d558535c1" 24SRC_URI[md5sum] = "d0de881ab8ead46928cafb7d558535c1"
24SRC_URI[sha256sum] = "4c076232b99433b09eb3c6d62f607192b3474d022703699b8f6aef4e79de3fb9" 25SRC_URI[sha256sum] = "4c076232b99433b09eb3c6d62f607192b3474d022703699b8f6aef4e79de3fb9"
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-library-LZ4-lookup.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-library-LZ4-lookup.patch
new file mode 100644
index 000000000..574dfd317
--- /dev/null
+++ b/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-library-LZ4-lookup.patch
@@ -0,0 +1,30 @@
1From 1d7612b063eb1fc7bf97bc27b13e1de596748aa1 Mon Sep 17 00:00:00 2001
2From: Sumit Garg <sumit.garg@linaro.org>
3Date: Wed, 8 Jan 2020 04:58:30 +0000
4Subject: [PATCH] Fix library LZ4 lookup.
5
6Signed-off-by: Sumit Garg <sumit.garg@linaro.org>
7---
8 cmake/FindLZ4.cmake | 9 +++++++--
9 1 file changed, 7 insertions(+), 2 deletions(-)
10
11diff --git a/cmake/FindLZ4.cmake b/cmake/FindLZ4.cmake
12index e97dd63e2b0..2f4694e727c 100644
13--- a/cmake/FindLZ4.cmake
14+++ b/cmake/FindLZ4.cmake
15@@ -1,5 +1,10 @@
16-find_path(LZ4_INCLUDE_DIR NAMES lz4.h)
17-find_library(LZ4_LIBRARY NAMES lz4)
18+find_path(LZ4_INCLUDE_DIR
19+ NAMES lz4.h
20+ NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
21+
22+find_library(LZ4_LIBRARY
23+ NAMES lz4
24+ NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
25
26 include(FindPackageHandleStandardArgs)
27 FIND_PACKAGE_HANDLE_STANDARD_ARGS(
28--
292.17.1
30