diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-05-24 22:35:24 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-05-24 22:35:24 +0300 |
commit | 0e0df451ae365f09d5c0c766b253f23de26901f2 (patch) | |
tree | db4d7d3ce85e02ee01ad58a86ede02ac876aae77 /meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-stacktrace-t.c-make-the-test-conditional.patch | |
parent | e370fd750e2821620ec427f26f8efab0069824ff (diff) | |
parent | 7e10dee74964afa47859704886128dd256acf854 (diff) | |
download | openbmc-0e0df451ae365f09d5c0c766b253f23de26901f2.tar.xz |
Merge tag '0.52' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-stacktrace-t.c-make-the-test-conditional.patch')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-stacktrace-t.c-make-the-test-conditional.patch | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-stacktrace-t.c-make-the-test-conditional.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-stacktrace-t.c-make-the-test-conditional.patch deleted file mode 100644 index d8f672d74..000000000 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-stacktrace-t.c-make-the-test-conditional.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 966cbeb309f867ff4ac8e7f4462be4780e421700 Mon Sep 17 00:00:00 2001 -From: Mingli Yu <mingli.yu@windriver.com> -Date: Mon, 25 Jan 2021 19:01:06 -0800 -Subject: [PATCH] stacktrace-t.c: make the test conditional - -Fixes: -/prj/tmp/work/cortexa57-poky-linux-musl/mariadb/10.5.8-r0/recipe-sysroot-native/usr/bin/aarch64-poky-linux-musl/../../libexec/aarch64-poky-linux-musl/gcc/aarch64-poky-linux-musl/10.2.0/ld.bfd: /usr/src/debug/mariadb/10.5.8-r0/mariadb-10.5.8/unittest/mysys/stacktrace-t.c:36: undefined reference to `my_safe_print_str' - -Upstream-Status: Submitted [https://jira.mariadb.org/browse/MDEV-24131] - -Signed-off-by: Mingli Yu <mingli.yu@windriver.com> ---- - unittest/mysys/stacktrace-t.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/unittest/mysys/stacktrace-t.c b/unittest/mysys/stacktrace-t.c -index 8fa0db15b36..d8408f80d76 100644 ---- a/unittest/mysys/stacktrace-t.c -+++ b/unittest/mysys/stacktrace-t.c -@@ -29,6 +29,7 @@ void test_my_safe_print_str() - memcpy(b_stack, "LEGAL", 6); - memcpy(b_bss, "LEGAL", 6); - -+#ifdef HAVE_STACKTRACE - #ifndef __SANITIZE_ADDRESS__ - fprintf(stderr, "\n===== stack =====\n"); - my_safe_print_str(b_stack, 65535); -@@ -48,6 +49,7 @@ void test_my_safe_print_str() - fprintf(stderr, "\n===== (const char*) 1 =====\n"); - my_safe_print_str((const char*)1, 5); - #endif /*__SANITIZE_ADDRESS__*/ -+#endif /*HAVE_STACKTRACE*/ - - free(b_heap); - --- -2.17.1 - |