Commit c0e8b04d authored by Rafaël Carré's avatar Rafaël Carré
Browse files

fix live555 compile on armlinux

parent e2613339
...@@ -1238,12 +1238,17 @@ ifdef HAVE_UCLIBC ...@@ -1238,12 +1238,17 @@ ifdef HAVE_UCLIBC
ifdef HAVE_BIGENDIAN ifdef HAVE_BIGENDIAN
(cd $<; ./genMakefiles armeb-uclibc && make $(HOSTCC)) (cd $<; ./genMakefiles armeb-uclibc && make $(HOSTCC))
endif endif
else
ifeq ($(ARCH),armel)
patch -p0 < Patches/live-armlinux.patch
(cd $<; ./genMakefiles armlinux && make $(HOSTCC))
else else
(cd $<; sed -e 's%-D_FILE_OFFSET_BITS=64%-D_FILE_OFFSET_BITS=64\ -fPIC\ -DPIC%' -i.orig config.linux) (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)) (cd $<; ./genMakefiles linux && make $(HOSTCC))
endif endif
endif endif
endif endif
endif
endif endif
mkdir -p $(PREFIX)/lib $(PREFIX)/include mkdir -p $(PREFIX)/lib $(PREFIX)/include
cp $</groupsock/libgroupsock.a $(PREFIX)/lib cp $</groupsock/libgroupsock.a $(PREFIX)/lib
......
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 =
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