diff options
| author |   Mingli Yu <mingli.yu@windriver.com> | 2019-03-15 02:50:06 -0700 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2019-03-15 09:17:11 -0700 |
| commit | e51545e4c355fec11b3e4edc3c05cf73c1088cbe (patch) | |
| tree | acf74621c10ff8bdb5189a782b77662d11a30ff5 /meta-oe/recipes-dbs/mysql/mariadb.inc | |
| parent | 60f872278dde6156fcf73c19cce3fea295938a06 (diff) | |
| download | meta-openembedded-e51545e4c355fec11b3e4edc3c05cf73c1088cbe.tar.gz | |
mariadb: fix atomic support on arm
Check to link with libatomic to enable C11
atomics support to fix below build error on arm:
| /build/tmp/work/armv5e-wrs-linux-gnueabi/mariadb/10.3.13-r0/recipe-sysroot-native/usr/bin/arm-wrs-linux-gnueabi/../../libexec/arm-wrs-linux-gnueabi/gcc/arm-wrs-linux-gnueabi/8.3.0/ld.bfd: librocksdblib.a(env_posix.cc.o): in function `std::__atomic_base<unsigned long long>::store(unsigned long long, std::memory_order)':
| /usr/include/c++/8.3.0/bits/atomic_base.h:374: undefined reference to `__atomic_store_8'
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-dbs/mysql/mariadb.inc')
| -rw-r--r-- | meta-oe/recipes-dbs/mysql/mariadb.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index 00a9d668cf..fca74d4481 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -17,6 +17,7 @@ SRC_URI = "https://downloads.mariadb.org/interstitial/${BPN}-${PV}/source/${BPN} file://0001-disable-ucontext-on-musl.patch \ file://c11_atomics.patch \ file://clang_version_header_conflict.patch \ + file://fix-arm-atomic.patch \ " SRC_URI[md5sum] = "603ce42e35b9a688f2cca05275acb5cb" SRC_URI[sha256sum] = "b2aa857ef5b84f85a7ea60a1eac7b34c0ca5151c71a0d44ce2d7fb028d71459a" @@ -63,7 +64,6 @@ PACKAGECONFIG[setupdb] = ", ,,${PN}-setupdb" # https://mariadb.atlassian.net/browse/MDEV-5982 TARGET_CFLAGS += "-fuse-ld=bfd" LDFLAGS += " -pthread" -LDFLAGS_append_armv5 = " -latomic" BUILD_CFLAGS += "-fuse-ld=bfd" BUILD_CXXFLAGS += "-fuse-ld=bfd" |