From 4707f6b74920a672e4ed23d0d2ddc1a30811bfb0 Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Sun, 1 Sep 2019 17:26:37 +0200 Subject: [PATCH] pkg/libb2: rename config.h to libb2_config.h This is to avoid conflics with other config.h files, e.g. when building for esp8266 where $(NEWLIB)/xtensa-lx106-elf/include/config.h gets included instead. --- .../include/{config.h => libb2_config.h} | 6 ++--- ...01-rename-config.h-to-libb2_config.h.patch | 26 +++++++++++++++++++ 2 files changed, 29 insertions(+), 3 deletions(-) rename pkg/libb2/include/{config.h => libb2_config.h} (82%) create mode 100644 pkg/libb2/patches/0001-rename-config.h-to-libb2_config.h.patch diff --git a/pkg/libb2/include/config.h b/pkg/libb2/include/libb2_config.h similarity index 82% rename from pkg/libb2/include/config.h rename to pkg/libb2/include/libb2_config.h index 75e6d3aeb4..025e093d68 100644 --- a/pkg/libb2/include/config.h +++ b/pkg/libb2/include/libb2_config.h @@ -1,5 +1,5 @@ -#ifndef CONFIG_H -#define CONFIG_H +#ifndef LIBB2_CONFIG_H +#define LIBB2_CONFIG_H #include "cpu.h" @@ -22,4 +22,4 @@ extern "C" { #ifdef __cplusplus } #endif -#endif /* CONFIG_H */ +#endif /* LIBB2_CONFIG_H */ diff --git a/pkg/libb2/patches/0001-rename-config.h-to-libb2_config.h.patch b/pkg/libb2/patches/0001-rename-config.h-to-libb2_config.h.patch new file mode 100644 index 0000000000..f7e270bfef --- /dev/null +++ b/pkg/libb2/patches/0001-rename-config.h-to-libb2_config.h.patch @@ -0,0 +1,26 @@ +From 213f6bb69962154a890925124d44aa8f3361270e Mon Sep 17 00:00:00 2001 +From: Benjamin Valentin +Date: Sun, 1 Sep 2019 17:21:06 +0200 +Subject: [PATCH] rename config.h to libb2_config.h + +This avoids conflics with other config.h files +--- + src/blake2-impl.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/blake2-impl.h b/src/blake2-impl.h +index c99e3de..a8622e7 100644 +--- a/src/blake2-impl.h ++++ b/src/blake2-impl.h +@@ -17,7 +17,7 @@ + #include + #include + #include +-#include "config.h" ++#include "libb2_config.h" + + #define BLAKE2_IMPL_CAT(x,y) x ## y + #define BLAKE2_IMPL_EVAL(x,y) BLAKE2_IMPL_CAT(x,y) +-- +2.20.1 +