[vlc-devel] commit: fix live555 compile on armlinux ( Rafaël Carré )

[git version control]

vlc | branch: master | Rafaël Carré <rafael.carre at gmail.com> | Thu Feb 18 08:17:15 2010 +0100| [c0e8b04da9e49184f5620340fe19655f0c104eca] | committer: Rafaël Carré 

fix live555 compile on armlinux

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

 extras/contrib/src/Makefile                    |    5 ++++
 extras/contrib/src/Patches/live-armlinux.patch |   28 ++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 0 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 4060606..58d8111 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1239,12 +1239,17 @@ ifdef HAVE_BIGENDIAN
 	(cd $<; ./genMakefiles armeb-uclibc && make $(HOSTCC))
 endif
 else
+ifeq ($(ARCH),armel)
+	patch -p0 < Patches/live-armlinux.patch
+	(cd $<; ./genMakefiles armlinux && make $(HOSTCC))
+else
 	(cd $<; sed -e 's%-D_FILE_OFFSET_BITS=64%-D_FILE_OFFSET_BITS=64\ -fPIC\ -DPIC%' -i.orig config.linux)
 	(cd $<; ./genMakefiles linux && make $(HOSTCC))
 endif
 endif
 endif
 endif
+endif
 	mkdir -p $(PREFIX)/lib $(PREFIX)/include
 	cp $</groupsock/libgroupsock.a $(PREFIX)/lib
 	cp $</liveMedia/libliveMedia.a $(PREFIX)/lib
diff --git a/extras/contrib/src/Patches/live-armlinux.patch b/extras/contrib/src/Patches/live-armlinux.patch
new file mode 100644
index 0000000..b307bfd
--- /dev/null
+++ b/extras/contrib/src/Patches/live-armlinux.patch
@@ -0,0 +1,28 @@
+Use g++ to build/link C++
+Use environment CROSS_COMPILE if present
+Do not use ar -L. when linking
+Put a space between ar options and arguments
+--- live/config.armlinux.orig	2010-02-18 08:11:09.000000000 +0100
++++ live/config.armlinux	2010-02-18 08:11:20.000000000 +0100
+@@ -1,16 +1,16 @@
+-CROSS_COMPILE=		arm-elf-
++CROSS_COMPILE?=		arm-elf-
+ COMPILE_OPTS =		$(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -DNO_SSTREAM=1 -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
+ C =			c
+ C_COMPILER =		$(CROSS_COMPILE)gcc
+ C_FLAGS =		$(COMPILE_OPTS)
+ CPP =			cpp
+-CPLUSPLUS_COMPILER =	$(CROSS_COMPILE)gcc
++CPLUSPLUS_COMPILER =	$(CROSS_COMPILE)g++
+ CPLUSPLUS_FLAGS =	$(COMPILE_OPTS) -Wall -DBSD=1
+ OBJ =			o
+-LINK =			$(CROSS_COMPILE)gcc -o
+-LINK_OPTS =		-L.
++LINK =			$(CROSS_COMPILE)g++ -o
++LINK_OPTS =		
+ CONSOLE_LINK_OPTS =	$(LINK_OPTS)
+-LIBRARY_LINK =		$(CROSS_COMPILE)ar cr
++LIBRARY_LINK =		$(CROSS_COMPILE)ar cr 
+ LIBRARY_LINK_OPTS =	$(LINK_OPTS)
+ LIB_SUFFIX =			a
+ LIBS_FOR_CONSOLE_APPLICATION =