From 6b2d8a740d01d4d2d7608f6e716037156eefcb65 Mon Sep 17 00:00:00 2001
From: Christian Helmuth <christian.helmuth@genode-labs.com>
Date: Thu, 13 Apr 2017 12:25:40 +0200
Subject: [PATCH] dde_linux: explicitly build C89 with GNU extensions

Issue #2372
---
 repos/dde_linux/lib/mk/lxip.mk                  | 1 +
 repos/dde_linux/lib/mk/spec/x86/intel_fb_drv.mk | 5 +++++
 repos/dde_linux/lib/mk/usb.inc                  | 2 +-
 repos/dde_linux/lib/mk/wifi.inc                 | 1 +
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/repos/dde_linux/lib/mk/lxip.mk b/repos/dde_linux/lib/mk/lxip.mk
index e6c5a53ffd..56d2125897 100644
--- a/repos/dde_linux/lib/mk/lxip.mk
+++ b/repos/dde_linux/lib/mk/lxip.mk
@@ -19,6 +19,7 @@ CC_WARN = -Wall -Wno-unused-variable -Wno-uninitialized \
           -Wno-unused-function -Wno-overflow -Wno-pointer-arith \
           -Wno-sign-compare
 
+CC_C_OPT  += -std=gnu89
 CC_C_OPT  += -Wno-unused-but-set-variable -Wno-pointer-sign
 
 CC_C_OPT  += -include $(LIB_INC_DIR)/lx_emul.h
diff --git a/repos/dde_linux/lib/mk/spec/x86/intel_fb_drv.mk b/repos/dde_linux/lib/mk/spec/x86/intel_fb_drv.mk
index 470c179f03..91fbaf1d15 100644
--- a/repos/dde_linux/lib/mk/spec/x86/intel_fb_drv.mk
+++ b/repos/dde_linux/lib/mk/spec/x86/intel_fb_drv.mk
@@ -13,6 +13,11 @@ SRC_C   += $(notdir $(wildcard $(LX_CONTRIB_DIR)/drivers/video/*.c))
 SRC_C   += $(notdir $(wildcard $(LX_CONTRIB_DIR)/drivers/video/fbdev/core/*.c))
 SRC_C   += $(notdir $(wildcard $(LX_CONTRIB_DIR)/lib/*.c))
 
+#
+# Linux sources are C89 with GNU extensions
+#
+CC_C_OPT += -std=gnu89
+
 #
 # Reduce build noise of compiling contrib code
 #
diff --git a/repos/dde_linux/lib/mk/usb.inc b/repos/dde_linux/lib/mk/usb.inc
index 806c6e3c3e..5cf6cc7231 100644
--- a/repos/dde_linux/lib/mk/usb.inc
+++ b/repos/dde_linux/lib/mk/usb.inc
@@ -25,7 +25,7 @@ CC_OPT += -DCONFIG_USB_DEVICEFS -DCONFIG_HOTPLUG -DDEBUG -DCONFIG_USB_PHY=1 \
 CC_WARN = -Wall -Wno-unused-variable -Wno-uninitialized \
           -Wno-unused-function -Wno-overflow
 
-CC_C_OPT += -Wno-unused-but-set-variable -Wno-pointer-sign -Wno-unused-label
+CC_C_OPT += -std=gnu89 -Wno-unused-but-set-variable -Wno-pointer-sign -Wno-unused-label
 
 CC_CXX_OPT = -fpermissive
 
diff --git a/repos/dde_linux/lib/mk/wifi.inc b/repos/dde_linux/lib/mk/wifi.inc
index e59d48f9a5..6fbd836212 100644
--- a/repos/dde_linux/lib/mk/wifi.inc
+++ b/repos/dde_linux/lib/mk/wifi.inc
@@ -26,6 +26,7 @@ SRC_C += lxc_emul.c
 CC_WARN  =
 CC_OPT  += -fno-builtin-toupper
 
+CC_C_OPT   += -std=gnu89
 CC_C_OPT   += -include $(LIB_INC_DIR)/lx_emul.h
 CC_C_OPT   += -Wall -Wno-unused-variable -Wno-unused-function -Wno-uninitialized
 CC_C_OPT   += -Wno-unused-but-set-variable -Wno-pointer-sign -Wno-cast-qual