diff options
Diffstat (limited to 'meta-oe/recipes-dbs/mysql/mariadb/fix-arm-atomic.patch')
-rw-r--r-- | meta-oe/recipes-dbs/mysql/mariadb/fix-arm-atomic.patch | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/fix-arm-atomic.patch b/meta-oe/recipes-dbs/mysql/mariadb/fix-arm-atomic.patch index 05b0cf8ff7..39b7fad983 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb/fix-arm-atomic.patch +++ b/meta-oe/recipes-dbs/mysql/mariadb/fix-arm-atomic.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From f447aca534d1a12809eeb146e8220d305cc3884d Mon Sep 17 00:00:00 2001 | 1 | From af4247cd24eab2d728fb3592f6e125ef5290361b Mon Sep 17 00:00:00 2001 |
2 | From: Mingli Yu <mingli.yu@windriver.com> | 2 | From: Mingli Yu <mingli.yu@windriver.com> |
3 | Date: Thu, 9 Apr 2020 14:07:19 +0800 | 3 | Date: Thu, 9 Apr 2020 14:07:19 +0800 |
4 | Subject: [PATCH] build_rocksdb.cmake: fix atomic support on arm | 4 | Subject: [PATCH] build_rocksdb.cmake: fix atomic support on arm |
@@ -16,10 +16,10 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | |||
16 | 1 file changed, 3 insertions(+) | 16 | 1 file changed, 3 insertions(+) |
17 | 17 | ||
18 | diff --git a/storage/rocksdb/build_rocksdb.cmake b/storage/rocksdb/build_rocksdb.cmake | 18 | diff --git a/storage/rocksdb/build_rocksdb.cmake b/storage/rocksdb/build_rocksdb.cmake |
19 | index d7895b0..3bcd52a 100644 | 19 | index e89dbfc0..acc6b48e 100644 |
20 | --- a/storage/rocksdb/build_rocksdb.cmake | 20 | --- a/storage/rocksdb/build_rocksdb.cmake |
21 | +++ b/storage/rocksdb/build_rocksdb.cmake | 21 | +++ b/storage/rocksdb/build_rocksdb.cmake |
22 | @@ -470,6 +470,9 @@ list(APPEND SOURCES ${CMAKE_CURRENT_BINARY_DIR}/build_version.cc) | 22 | @@ -490,6 +490,9 @@ list(APPEND SOURCES ${CMAKE_CURRENT_BINARY_DIR}/build_version.cc) |
23 | 23 | ||
24 | ADD_CONVENIENCE_LIBRARY(rocksdblib ${SOURCES}) | 24 | ADD_CONVENIENCE_LIBRARY(rocksdblib ${SOURCES}) |
25 | target_link_libraries(rocksdblib ${THIRDPARTY_LIBS} ${SYSTEM_LIBS}) | 25 | target_link_libraries(rocksdblib ${THIRDPARTY_LIBS} ${SYSTEM_LIBS}) |
@@ -29,6 +29,3 @@ index d7895b0..3bcd52a 100644 | |||
29 | IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") | 29 | IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") |
30 | set_target_properties(rocksdblib PROPERTIES COMPILE_FLAGS "-fPIC -fno-builtin-memcmp -Wno-error") | 30 | set_target_properties(rocksdblib PROPERTIES COMPILE_FLAGS "-fPIC -fno-builtin-memcmp -Wno-error") |
31 | endif() | 31 | endif() |
32 | -- | ||
33 | 2.7.4 | ||
34 | |||