From af5760977d9a7f637cbe3a3f09c7da3bde95f226 Mon Sep 17 00:00:00 2001
From: Martine Lenders <m.lenders@fu-berlin.de>
Date: Mon, 23 Oct 2017 15:49:10 +0200
Subject: [PATCH 1/3] newlib: use RIOT dependency system for _GNU_SOURCE
 instead

---
 Makefile.dep                   | 10 ++++++++++
 makefiles/libc/newlib.mk       |  4 ++++
 makefiles/pseudomodules.inc.mk |  1 +
 3 files changed, 15 insertions(+)

diff --git a/Makefile.dep b/Makefile.dep
index 9992c38a1b..618042356c 100644
--- a/Makefile.dep
+++ b/Makefile.dep
@@ -8,6 +8,12 @@ OLD_USEPKG := $(sort $(USEPKG))
 # pull dependencies from drivers
 include $(RIOTBASE)/drivers/Makefile.dep
 
+ifneq (,$(filter cbor_ctime,$(USEMODULE)))
+  ifneq (,$(filter newlib,$(USEMODULE)))
+    USEMODULE += newlib_gnu_source
+  endif
+endif
+
 ifneq (,$(filter csma_sender,$(USEMODULE)))
   USEMODULE += random
   USEMODULE += xtimer
@@ -381,6 +387,10 @@ ifneq (,$(filter od,$(USEMODULE)))
   USEMODULE += fmt
 endif
 
+ifneq (,$(filter newlib_gnu_source,$(USEMODULE)))
+  USEMODULE += newlib
+endif
+
 ifneq (,$(filter newlib_nano,$(USEMODULE)))
   USEMODULE += newlib
 endif
diff --git a/makefiles/libc/newlib.mk b/makefiles/libc/newlib.mk
index c45b2a5a13..3d49cc42f0 100644
--- a/makefiles/libc/newlib.mk
+++ b/makefiles/libc/newlib.mk
@@ -9,6 +9,10 @@ ifneq (,$(filter newlib_nano,$(USEMODULE)))
   endif
 endif
 
+ifneq (,$(filter newlib_gnu_source,$(USEMODULE)))
+  CFLAGS += -D_GNU_SOURCE=1
+endif
+
 ifeq (1,$(USE_NEWLIB_NANO))
   export LINKFLAGS += -specs=nano.specs
 endif
diff --git a/makefiles/pseudomodules.inc.mk b/makefiles/pseudomodules.inc.mk
index 458ea356e9..7317231e63 100644
--- a/makefiles/pseudomodules.inc.mk
+++ b/makefiles/pseudomodules.inc.mk
@@ -52,6 +52,7 @@ PSEUDOMODULES += netstats_l2
 PSEUDOMODULES += netstats_ipv6
 PSEUDOMODULES += netstats_rpl
 PSEUDOMODULES += newlib
+PSEUDOMODULES += newlib_gnu_source
 PSEUDOMODULES += newlib_nano
 PSEUDOMODULES += openthread
 PSEUDOMODULES += pktqueue

From 084aa48e21cd310d7714cba0318884bd547ce184 Mon Sep 17 00:00:00 2001
From: kYc0o <fco.ja.ac@gmail.com>
Date: Tue, 24 Oct 2017 16:02:58 +0200
Subject: [PATCH 2/3] sys/cbor/Makefile: align to two spaces

---
 sys/cbor/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/cbor/Makefile b/sys/cbor/Makefile
index 8e1c52a54e..bd0de57963 100644
--- a/sys/cbor/Makefile
+++ b/sys/cbor/Makefile
@@ -1,7 +1,7 @@
 MODULE = cbor
 
 ifneq ($(shell uname -s),Darwin)
-	CFLAGS += -D_XOPEN_SOURCE=600
+  CFLAGS += -D_XOPEN_SOURCE=600
 endif
 
 include $(RIOTBASE)/Makefile.base

From 4839a1cbbf71631c529a49b40a53a8f1f8702cb4 Mon Sep 17 00:00:00 2001
From: kYc0o <fco.ja.ac@gmail.com>
Date: Tue, 24 Oct 2017 16:03:31 +0200
Subject: [PATCH 3/3] sys/cbor/cbor.c: add <time.h> if ctime module is used

---
 sys/cbor/cbor.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sys/cbor/cbor.c b/sys/cbor/cbor.c
index 05a918cd38..ebab47cbee 100644
--- a/sys/cbor/cbor.c
+++ b/sys/cbor/cbor.c
@@ -24,6 +24,9 @@
 #include <stdlib.h>
 #include <string.h>
 
+#ifdef MODULE_CBOR_CTIME
+#include <time.h>
+#endif
 #define ENABLE_DEBUG (0)
 #include "debug.h"