From ab5ce3bfc65a4d52240737d56488fb02461e1b2a Mon Sep 17 00:00:00 2001
From: Benjamin Valentin <benpicco@googlemail.com>
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} (90%)
 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 90%
rename from pkg/libb2/include/config.h
rename to pkg/libb2/include/libb2_config.h
index 7439a5a4ef1be..153c97f745ed3 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 PKG_LIBB2_CONFIG_H
+#define PKG_LIBB2_CONFIG_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -21,4 +21,4 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif
-#endif /* CONFIG_H */
+#endif /* PKG_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 0000000000000..f7e270bfef43d
--- /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 <benpicco@googlemail.com>
+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 <stddef.h>
+ #include <stdint.h>
+ #include <string.h>
+-#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
+