fix live555 compile on armlinux

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 40606067c0c2590a6ca789841fb82b0bd51e4872..58d8111ce72b272dd144b8e0228890cad8dbe154 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1238,12 +1238,17 @@ ifdef HAVE_UCLIBC
 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

diff --git a/extras/contrib/src/Patches/live-armlinux.patch b/extras/contrib/src/Patches/live-armlinux.patch
new file mode 100644 (file)
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-\r
++CROSS_COMPILE?=               arm-elf-\r
+ COMPILE_OPTS =                $(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -DNO_SSTREAM=1 -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64\r
+ C =                   c\r
+ C_COMPILER =          $(CROSS_COMPILE)gcc\r
+ C_FLAGS =             $(COMPILE_OPTS)\r
+ CPP =                 cpp\r
+-CPLUSPLUS_COMPILER =  $(CROSS_COMPILE)gcc\r
++CPLUSPLUS_COMPILER =  $(CROSS_COMPILE)g++\r
+ CPLUSPLUS_FLAGS =     $(COMPILE_OPTS) -Wall -DBSD=1\r
+ OBJ =                 o\r
+-LINK =                        $(CROSS_COMPILE)gcc -o\r
+-LINK_OPTS =           -L.\r
++LINK =                        $(CROSS_COMPILE)g++ -o\r
++LINK_OPTS =           \r
+ CONSOLE_LINK_OPTS =   $(LINK_OPTS)\r
+-LIBRARY_LINK =                $(CROSS_COMPILE)ar cr\r
++LIBRARY_LINK =                $(CROSS_COMPILE)ar cr \r
+ LIBRARY_LINK_OPTS =   $(LINK_OPTS)\r
+ LIB_SUFFIX =                  a\r
+ LIBS_FOR_CONSOLE_APPLICATION =\r