[vlc-commits] contribs: Fix iconv build when using gcc 5.x

[Hugo Beauzée-Luyssen]

vlc/vlc-2.2 | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Mon Jan  4 16:07:54 2016 +0100| [bdfc5c8f300f18e6400024a49150d280141e6e8c] | committer: Jean-Baptiste Kempf

contribs: Fix iconv build when using gcc 5.x

GCC 5.x defaults to -std=gnu11, which changes the __inline keyword
semantics, causing some iconv functions not to be inlined, but they are
not declared as exported, thus causing linking to iconv to fail

(cherry picked from commit ba25882ce80553dc098f41d39cada8eaf9587f32)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=bdfc5c8f300f18e6400024a49150d280141e6e8c
---

 contrib/src/iconv/rules.mak |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/src/iconv/rules.mak b/contrib/src/iconv/rules.mak
index 3596463..bb01760 100644
--- a/contrib/src/iconv/rules.mak
+++ b/contrib/src/iconv/rules.mak
@@ -35,6 +35,6 @@ endif
 	$(MOVE)
 
 .iconv: iconv
-	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-nls
+	cd $< && $(HOSTVARS) ./configure CFLAGS="$(CFLAGS) -fgnu89-inline" $(HOSTCONF) --disable-nls
 	cd $< && $(MAKE) install
 	touch $@