diff options
Diffstat (limited to 'meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-library-LZ4-lookup.patch')
| -rw-r--r-- | meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-library-LZ4-lookup.patch | 17 |
1 files changed, 9 insertions, 8 deletions
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 index 0cf0560e11..6d9352fe86 100644 --- 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 | |||
| @@ -1,30 +1,31 @@ | |||
| 1 | From 1d7612b063eb1fc7bf97bc27b13e1de596748aa1 Mon Sep 17 00:00:00 2001 | 1 | From f15fbdf1244ca9ce01c5507660a86d685ed88bcf Mon Sep 17 00:00:00 2001 |
| 2 | From: Sumit Garg <sumit.garg@linaro.org> | 2 | From: Sumit Garg <sumit.garg@linaro.org> |
| 3 | Date: Wed, 8 Jan 2020 04:58:30 +0000 | 3 | Date: Mon, 21 Mar 2022 15:08:40 +0800 |
| 4 | Subject: [PATCH] Fix library LZ4 lookup. | 4 | Subject: [PATCH] Fix library LZ4 lookup. |
| 5 | 5 | ||
| 6 | Signed-off-by: Sumit Garg <sumit.garg@linaro.org> | 6 | Signed-off-by: Sumit Garg <sumit.garg@linaro.org> |
| 7 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
| 7 | --- | 8 | --- |
| 8 | cmake/FindLZ4.cmake | 9 +++++++-- | 9 | cmake/FindLZ4.cmake | 9 +++++++-- |
| 9 | 1 file changed, 7 insertions(+), 2 deletions(-) | 10 | 1 file changed, 7 insertions(+), 2 deletions(-) |
| 10 | 11 | ||
| 11 | diff --git a/cmake/FindLZ4.cmake b/cmake/FindLZ4.cmake | 12 | diff --git a/cmake/FindLZ4.cmake b/cmake/FindLZ4.cmake |
| 12 | index e97dd63e2b0..2f4694e727c 100644 | 13 | index eebd859..094241c 100644 |
| 13 | --- a/cmake/FindLZ4.cmake | 14 | --- a/cmake/FindLZ4.cmake |
| 14 | +++ b/cmake/FindLZ4.cmake | 15 | +++ b/cmake/FindLZ4.cmake |
| 15 | @@ -1,5 +1,10 @@ | 16 | @@ -1,5 +1,10 @@ |
| 16 | -find_path(LZ4_INCLUDE_DIR NAMES lz4.h) | 17 | -find_path(LZ4_INCLUDE_DIRS NAMES lz4.h) |
| 17 | -find_library(LZ4_LIBRARIES NAMES lz4) | 18 | -find_library(LZ4_LIBRARIES NAMES lz4) |
| 18 | +find_path(LZ4_INCLUDE_DIR | 19 | +find_path(LZ4_INCLUDE_DIR |
| 19 | + NAMES lz4.h | 20 | + NAMES lz4.h |
| 20 | + NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH) | 21 | + NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH) |
| 21 | + | 22 | + |
| 22 | +find_library(LZ4_LIBRARIES | 23 | +find_library(LZ4_LIBRARIES |
| 23 | + NAMES lz4 | 24 | + NAMES lz4 |
| 24 | + NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH) | 25 | + NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH) |
| 25 | 26 | ||
| 26 | include(FindPackageHandleStandardArgs) | 27 | if(LZ4_INCLUDE_DIRS AND EXISTS "${LZ4_INCLUDE_DIRS}/lz4.h") |
| 27 | FIND_PACKAGE_HANDLE_STANDARD_ARGS( | 28 | file(STRINGS "${LZ4_INCLUDE_DIRS}/lz4.h" LZ4_H REGEX "^#define LZ4_VERSION_[MR]") |
| 28 | -- | 29 | -- |
| 29 | 2.17.1 | 30 | 2.25.1 |
| 30 | 31 | ||
