[vlc-commits] live555: enable Solaris target

[Sean McGovern]

vlc/vlc-2.2 | branch: master | Sean McGovern <gseanmcg at gmail.com> | Tue Jul 22 22:59:17 2014 -0400| [c355cf190ab6027f7f177bf94789226c13f63d3d] | committer: Jean-Baptiste Kempf

live555: enable Solaris target

Signed-off-by: Rafaël Carré <funman at videolan.org>
(cherry picked from commit ac0dc4ba23dcdf02ab5617606a712fb415f3eb62)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 contrib/src/live555/rules.mak |    8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/contrib/src/live555/rules.mak b/contrib/src/live555/rules.mak
index 6047a5b..888f790 100644
--- a/contrib/src/live555/rules.mak
+++ b/contrib/src/live555/rules.mak
@@ -27,6 +27,13 @@ ifdef HAVE_BSD
 LIVE_TARGET := freebsd
 endif
 endif
+ifdef HAVE_SOLARIS
+ifeq ($(ARCH),x86_64)
+LIVE_TARGET := solaris-64bit
+else
+LIVE_TARGET := solaris-32bit
+endif
+endif
 
 LIVE_EXTRA_CFLAGS := $(EXTRA_CFLAGS) -fexceptions
 
@@ -41,6 +48,7 @@ live555: $(LIVE555_FILE) .sum-live555
 	cd live && sed -i.orig \
 		-e 's%^\(COMPILE_OPTS.*\)$$%\1 '"$(LIVE_EXTRA_CFLAGS)%" config.*
 	cd live && sed -e 's%-D_FILE_OFFSET_BITS=64%-D_FILE_OFFSET_BITS=64\ -fPIC\ -DPIC%' -i.orig config.linux
+	cd live && sed -e 's%-DSOLARIS%-DSOLARIS -DXLOCALE_NOT_USED%' -i.orig config.solaris-*bit
 ifdef HAVE_ANDROID
 	cd live && sed -e 's%-DPIC%-DPIC -DNO_SSTREAM=1 -DLOCALE_NOT_USED -I$(ANDROID_NDK)/platforms/android-9/arch-$(PLATFORM_SHORT_ARCH)/usr/include%' -i.orig config.linux
 endif