aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSumit Garg <sumit.garg@linaro.org>2020-01-21 14:39:04 +0530
committerArmin Kuster <akuster808@gmail.com>2020-01-29 21:21:42 -0800
commit14acba7937a7bf71dc29e4075ea986e08b97868f (patch)
treee5386ea741c8a8bf489917425dbbdc5ddabd1b48
parentf64c2d691ea597aa6221e3d7706a4d022e07bfea (diff)
downloadmeta-openembedded-contrib-14acba7937a7bf71dc29e4075ea986e08b97868f.tar.gz
meta-openembedded-contrib-14acba7937a7bf71dc29e4075ea986e08b97868f.tar.bz2
meta-openembedded-contrib-14acba7937a7bf71dc29e4075ea986e08b97868f.zip
mariadb: fix library LZ4 lookup
While cross-compiling mariadb package it tries to link lz4 library present in the target sysroot and if not found it tries to link host lz4 library which is incorrect leading to linker errors. So fix that via restricting lz4 library lookup to target sysroot only. Signed-off-by: Sumit Garg <sumit.garg@linaro.org> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-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 e1ae58ae7a..703e172174 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb.inc
+++ b/meta-oe/recipes-dbs/mysql/mariadb.inc
@@ -18,6 +18,7 @@ SRC_URI = "http://archive.mariadb.org/${BP}/source/${BP}.tar.gz \
file://c11_atomics.patch \
file://clang_version_header_conflict.patch \
file://fix-arm-atomic.patch \
+ file://0001-Fix-library-LZ4-lookup.patch \
"
SRC_URI[md5sum] = "b3524c0825c3a1c255496daea38304a0"
SRC_URI[sha256sum] = "69456ca85bf9d96c6d28b4ade2a9f6787d79a602e27ef941f9ba4e0b55dddedc"
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 0000000000..574dfd317a
--- /dev/null
+++ b/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-library-LZ4-lookup.patch
@@ -0,0 +1,30 @@
+From 1d7612b063eb1fc7bf97bc27b13e1de596748aa1 Mon Sep 17 00:00:00 2001
+From: Sumit Garg <sumit.garg@linaro.org>
+Date: Wed, 8 Jan 2020 04:58:30 +0000
+Subject: [PATCH] Fix library LZ4 lookup.
+
+Signed-off-by: Sumit Garg <sumit.garg@linaro.org>
+---
+ cmake/FindLZ4.cmake | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/FindLZ4.cmake b/cmake/FindLZ4.cmake
+index e97dd63e2b0..2f4694e727c 100644
+--- a/cmake/FindLZ4.cmake
++++ b/cmake/FindLZ4.cmake
+@@ -1,5 +1,10 @@
+-find_path(LZ4_INCLUDE_DIR NAMES lz4.h)
+-find_library(LZ4_LIBRARY NAMES lz4)
++find_path(LZ4_INCLUDE_DIR
++ NAMES lz4.h
++ NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
++
++find_library(LZ4_LIBRARY
++ NAMES lz4
++ NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
+
+ include(FindPackageHandleStandardArgs)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(
+--
+2.17.1
+