[vlc-commits] contrib: vorbis: fix clang x86 build

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Thu Aug 25 14:59:58 2016 +0200| [559b8f7a9a92061370226210aa1cf7f400da4fde] | committer: Thomas Guillem

contrib: vorbis: fix clang x86 build

Remove -mno-ieee-fp CFLAGS

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

 contrib/src/vorbis/clang.patch | 15 +++++++++++++++
 contrib/src/vorbis/rules.mak   |  3 +++
 2 files changed, 18 insertions(+)

diff --git a/contrib/src/vorbis/clang.patch b/contrib/src/vorbis/clang.patch
new file mode 100644
index 0000000..6be9468
--- /dev/null
+++ b/contrib/src/vorbis/clang.patch
@@ -0,0 +1,15 @@
+diff -Naur libvorbis.orig/configure.ac libvorbis/configure.ac
+--- libvorbis.orig/configure.ac	2016-08-25 14:40:51.528447418 +0200
++++ libvorbis/configure.ac	2016-08-25 14:52:58.181761438 +0200
+@@ -128,9 +128,9 @@
+ 	case $host in 
+ 	*86-*-linux*)
+ 		DEBUG="-g -Wall -Wextra -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
+-		CFLAGS="-O3 -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char"
++		CFLAGS="-O3 -ffast-math -D_REENTRANT -fsigned-char"
+ #              	PROFILE="-Wall -Wextra -pg -g -O3 -ffast-math -D_REENTRANT -fsigned-char -fno-inline -static"
+-		PROFILE="-Wall -Wextra -pg -g -O3 -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char -fno-inline"
++		PROFILE="-Wall -Wextra -pg -g -O3 -ffast-math -D_REENTRANT -fsigned-char -fno-inline"
+ 
+ 		# glibc < 2.1.3 has a serious FP bug in the math inline header
+ 		# that will cripple Vorbis.  Look to see if the magic FP stack
diff --git a/contrib/src/vorbis/rules.mak b/contrib/src/vorbis/rules.mak
index 299891e..c6dc5a6 100644
--- a/contrib/src/vorbis/rules.mak
+++ b/contrib/src/vorbis/rules.mak
@@ -24,6 +24,9 @@ $(TARBALLS)/libvorbis-$(VORBIS_VERSION).tar.xz:
 
 libvorbis: libvorbis-$(VORBIS_VERSION).tar.xz .sum-vorbis
 	$(UNPACK)
+ifeq ($(CC), clang)
+	$(APPLY) $(SRC)/vorbis/clang.patch
+endif
 	$(UPDATE_AUTOCONFIG)
 	$(APPLY) $(SRC)/vorbis/vorbis-bitcode.patch
 	$(call pkg_static,"vorbis.pc.in")