From 6947d3245f9c76d9124a4c4f3c164154a75f3f62 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Thu, 23 Apr 2015 13:17:05 +0200
Subject: [PATCH] itk libdca libvpx openscenegraph: gcc 5 compatibility

---
 src/itk.mk            | 3 +++
 src/libdca.mk         | 3 ++-
 src/libvpx.mk         | 3 ++-
 src/openscenegraph.mk | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/itk.mk b/src/itk.mk
index b0e82a17..f25af6c4 100644
--- a/src/itk.mk
+++ b/src/itk.mk
@@ -16,6 +16,8 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
+    $(SED) -i 's^#  error "Dunno about this gcc"^#  warning "Dunno about this gcc"^;' \
+        '$(1)/Modules/ThirdParty/VNL/src/vxl/vcl/vcl_compiler.h'
     mkdir '$(1).build'
     cd '$(1).build' && cmake \
         -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
@@ -25,6 +27,7 @@ define $(PKG)_BUILD
         -DBUILD_TESTING=FALSE \
         -DBUILD_EXAMPLES=FALSE \
         -DITK_USE_SYSTEM_HDF5=TRUE \
+        -DCMAKE_C_FLAGS='-std=gnu89' \
         '$(1)'
     $(MAKE) -C '$(1).build' -j '$(JOBS)' install VERBOSE=1
 endef
diff --git a/src/libdca.mk b/src/libdca.mk
index eb567911..81d93996 100644
--- a/src/libdca.mk
+++ b/src/libdca.mk
@@ -17,7 +17,8 @@ endef
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        $(MXE_CONFIGURE_OPTS)
+        $(MXE_CONFIGURE_OPTS) \
+        CFLAGS='-std=gnu89'
     $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
     $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 
diff --git a/src/libvpx.mk b/src/libvpx.mk
index bc2f7743..4a315751 100644
--- a/src/libvpx.mk
+++ b/src/libvpx.mk
@@ -25,7 +25,8 @@ define $(PKG)_BUILD
         --target=@libvpx-target@ \
         --disable-examples \
         --disable-install-docs \
-        --as=$(TARGET)-yasm
+        --as=$(TARGET)-yasm \
+        --extra-cflags='-std=gnu89'
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' -j 1 install
     $(TARGET)-ranlib $(PREFIX)/$(TARGET)/lib/libvpx.a
diff --git a/src/openscenegraph.mk b/src/openscenegraph.mk
index 25ee304d..520797f4 100644
--- a/src/openscenegraph.mk
+++ b/src/openscenegraph.mk
@@ -22,7 +22,7 @@ define $(PKG)_BUILD
     mkdir '$(1).build'
     cd '$(1).build' && cmake '$(1)' \
         -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
-        -DCMAKE_CXX_FLAGS=-D__STDC_CONSTANT_MACROS \
+        -DCMAKE_CXX_FLAGS='-D__STDC_CONSTANT_MACROS -fpermissive' \
         -DCMAKE_HAVE_PTHREAD_H=OFF \
         -DPKG_CONFIG_EXECUTABLE='$(PREFIX)/bin/$(TARGET)-pkg-config' \
         -DDYNAMIC_OPENTHREADS=OFF \