Commit c355cf19 authored by Sean McGovern's avatar Sean McGovern Committed by Jean-Baptiste Kempf

live555: enable Solaris target

Signed-off-by: default avatarRafaël Carré <funman@videolan.org>
(cherry picked from commit ac0dc4ba23dcdf02ab5617606a712fb415f3eb62)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 71b608cb
...@@ -27,6 +27,13 @@ ifdef HAVE_BSD ...@@ -27,6 +27,13 @@ ifdef HAVE_BSD
LIVE_TARGET := freebsd LIVE_TARGET := freebsd
endif endif
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 LIVE_EXTRA_CFLAGS := $(EXTRA_CFLAGS) -fexceptions
...@@ -41,6 +48,7 @@ live555: $(LIVE555_FILE) .sum-live555 ...@@ -41,6 +48,7 @@ live555: $(LIVE555_FILE) .sum-live555
cd live && sed -i.orig \ cd live && sed -i.orig \
-e 's%^\(COMPILE_OPTS.*\)$$%\1 '"$(LIVE_EXTRA_CFLAGS)%" config.* -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%-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 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 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 endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment