From c3e383fdc58b82be79c8f24b1a5fec96b965f578 Mon Sep 17 00:00:00 2001 From: Bruce Emehiser Date: Sun, 27 Feb 2022 03:07:20 -0800 Subject: [PATCH] (#9298) hiredis/1.0.2 Fix AIX with patch from hiredis master. --- recipes/hiredis/all/conandata.yml | 2 ++ recipes/hiredis/all/patches/fix-aix.patch | 15 +++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 recipes/hiredis/all/patches/fix-aix.patch diff --git a/recipes/hiredis/all/conandata.yml b/recipes/hiredis/all/conandata.yml index 142db2cfcc30a..8b8b073d7f542 100644 --- a/recipes/hiredis/all/conandata.yml +++ b/recipes/hiredis/all/conandata.yml @@ -9,6 +9,8 @@ patches: "1.0.2": - patch_file: "patches/fix-cmake.patch" base_path: "source_subfolder" + - patch_file: "patches/fix-aix.patch" + base_path: "source_subfolder" "1.0.0": - patch_file: "patches/fix-cmake.patch" base_path: "source_subfolder" diff --git a/recipes/hiredis/all/patches/fix-aix.patch b/recipes/hiredis/all/patches/fix-aix.patch new file mode 100644 index 0000000000000..7aa6522eebdf3 --- /dev/null +++ b/recipes/hiredis/all/patches/fix-aix.patch @@ -0,0 +1,15 @@ +diff --git a/fmacros.h b/fmacros.h +index 3227faa..754a53c 100644 +--- a/fmacros.h ++++ b/fmacros.h +@@ -1,8 +1,10 @@ + #ifndef __HIREDIS_FMACRO_H + #define __HIREDIS_FMACRO_H + ++#ifndef _AIX + #define _XOPEN_SOURCE 600 + #define _POSIX_C_SOURCE 200112L ++#endif + + #if defined(__APPLE__) && defined(__MACH__) + /* Enable TCP_KEEPALIVE */