diff options
author | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-11-02 11:07:33 +0900 |
---|---|---|
committer | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-11-02 11:07:33 +0900 |
commit | 1c7d6584a7811b7785ae5c1e378f14b5ba0971cf (patch) | |
tree | cd70a267a5ef105ba32f200aa088e281fbd85747 /external/meta-openembedded/meta-oe/recipes-extended/redis/redis | |
parent | 4204309872da5cb401cbb2729d9e2d4869a87f42 (diff) |
basesystem-jjsandbox/ToshikazuOhiwa/master-jj
recipes
Diffstat (limited to 'external/meta-openembedded/meta-oe/recipes-extended/redis/redis')
3 files changed, 51 insertions, 72 deletions
diff --git a/external/meta-openembedded/meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch b/external/meta-openembedded/meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch new file mode 100644 index 00000000..b5c4133e --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch @@ -0,0 +1,32 @@ +From 97584e1eb78dc18599534b47b6670c20c63f5ee2 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 10 Sep 2019 20:04:26 -0700 +Subject: [PATCH] src: Do not reset FINAL_LIBS + +This helps case where additional libraries are needed to be passed from +environment to get it going + +e.g. -latomic is needed on clang/x86 to provide for 64bit atomics + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Makefile b/src/Makefile +index 7f7c625..c71dd3b 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -75,7 +75,7 @@ endif + + FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) + FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) +-FINAL_LIBS=-lm ++FINAL_LIBS+=-lm + DEBUG=-g -ggdb + + # Linux ARM needs -latomic at linking time +-- +2.23.0 + diff --git a/external/meta-openembedded/meta-oe/recipes-extended/redis/redis/GNU_SOURCE.patch b/external/meta-openembedded/meta-oe/recipes-extended/redis/redis/GNU_SOURCE.patch new file mode 100644 index 00000000..9a40d832 --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-extended/redis/redis/GNU_SOURCE.patch @@ -0,0 +1,19 @@ +Define _GNU_SOURCE to get PTHREAD_MUTEX_INITIALIZER + +Fixes +| zmalloc.c:87:37: error: 'PTHREAD_MUTEX_DEFAULT' undeclared here (not in a function) +| 87 | pthread_mutex_t used_memory_mutex = PTHREAD_MUTEX_INITIALIZER; +| | ^~~~~~~~~~~~~~~~~~~~~~~~~ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/src/zmalloc.c ++++ b/src/zmalloc.c +@@ -28,6 +28,7 @@ + * POSSIBILITY OF SUCH DAMAGE. + */ + ++#define _GNU_SOURCE + #include <stdio.h> + #include <stdlib.h> + #include <stdint.h> diff --git a/external/meta-openembedded/meta-oe/recipes-extended/redis/redis/remove-atomics.patch b/external/meta-openembedded/meta-oe/recipes-extended/redis/redis/remove-atomics.patch deleted file mode 100644 index 23b2f2aa..00000000 --- a/external/meta-openembedded/meta-oe/recipes-extended/redis/redis/remove-atomics.patch +++ /dev/null @@ -1,72 +0,0 @@ -From c486455e0691f9915018b9d8b133200a6c61a3c5 Mon Sep 17 00:00:00 2001 -From: Alistair Francis <alistair.francis@wdc.com> -Date: Thu, 24 May 2018 09:58:42 -0700 -Subject: [PATCH] Remove atomics - -Based on this patch: -https://github.com/patrikx3/lede-redis/blob/master/redis/patches/010-redis.patch - -Signed-off-by: Alistair Francis <alistair.francis@wdc.com> ---- - deps/jemalloc/src/pages.c | 22 +--------------------- - src/atomicvar.h | 4 ++-- - 2 files changed, 3 insertions(+), 23 deletions(-) - -diff --git a/deps/jemalloc/src/pages.c b/deps/jemalloc/src/pages.c -index 83a167f6..8e82c78d 100644 ---- a/deps/jemalloc/src/pages.c -+++ b/deps/jemalloc/src/pages.c -@@ -147,27 +147,7 @@ pages_purge(void *addr, size_t size) - { - bool unzeroed; - --#ifdef _WIN32 -- VirtualAlloc(addr, size, MEM_RESET, PAGE_READWRITE); -- unzeroed = true; --#elif defined(JEMALLOC_HAVE_MADVISE) --# ifdef JEMALLOC_PURGE_MADVISE_DONTNEED --# define JEMALLOC_MADV_PURGE MADV_DONTNEED --# define JEMALLOC_MADV_ZEROS true --# elif defined(JEMALLOC_PURGE_MADVISE_FREE) --# define JEMALLOC_MADV_PURGE MADV_FREE --# define JEMALLOC_MADV_ZEROS false --# else --# error "No madvise(2) flag defined for purging unused dirty pages." --# endif -- int err = madvise(addr, size, JEMALLOC_MADV_PURGE); -- unzeroed = (!JEMALLOC_MADV_ZEROS || err != 0); --# undef JEMALLOC_MADV_PURGE --# undef JEMALLOC_MADV_ZEROS --#else -- /* Last resort no-op. */ -- unzeroed = true; --#endif -+ unzeroed = false; - return (unzeroed); - } - -diff --git a/src/atomicvar.h b/src/atomicvar.h -index 84a5bbc5..f9b563c2 100644 ---- a/src/atomicvar.h -+++ b/src/atomicvar.h -@@ -68,7 +68,7 @@ - * is reported. */ - // #define __ATOMIC_VAR_FORCE_SYNC_MACROS - --#if !defined(__ATOMIC_VAR_FORCE_SYNC_MACROS) && defined(__ATOMIC_RELAXED) && !defined(__sun) && (!defined(__clang__) || !defined(__APPLE__) || __apple_build_version__ > 4210057) -+#if defined(CONFIG_EDAC_ATOMIC_SCRUB) && !defined(__ATOMIC_VAR_FORCE_SYNC_MACROS) && defined(__ATOMIC_RELAXED) && !defined(__sun) && (!defined(__clang__) || !defined(__APPLE__) || __apple_build_version__ > 4210057) - /* Implementation using __atomic macros. */ - - #define atomicIncr(var,count) __atomic_add_fetch(&var,(count),__ATOMIC_RELAXED) -@@ -82,7 +82,7 @@ - #define atomicSet(var,value) __atomic_store_n(&var,value,__ATOMIC_RELAXED) - #define REDIS_ATOMIC_API "atomic-builtin" - --#elif defined(HAVE_ATOMIC) -+#elif defined(CONFIG_EDAC_ATOMIC_SCRUB) && defined(HAVE_ATOMIC) - /* Implementation using __sync macros. */ - - #define atomicIncr(var,count) __sync_add_and_fetch(&var,(count)) --- -2.17.0 - |