[vlc-devel] [PATCH] contrib/live555: use our compiler

[Rafaël Carré]

On Sat, 21 Jan 2012 22:26:57 +0100
Dominique Martinet <asmadeus at codewreck.org> wrote:

> I'd like it better if it worked :)
> 
> Here's a diff that works on top of his patch (on 1.2, but I'd suppose
> it'd work on master too)
> 
> I'll submit a proper patch if you agree with it, I guess.

I wanted to change the flags with sed like we do on other platforms

I'll do that when parent patch is committed

> contents:
>  - fixed android.patch to fix config.linux since it would appear you
>  want to use it (a diff's diff with extra-long lines, yay)
>  - actually using config.linux on android target too? (the sed is just
>  wrong for config.armlinux)
> 
> 
> diff --git a/contrib/src/live555/android.patch
> b/contrib/src/live555/android.patch
> index 621675a..a222d42 100644
> --- a/contrib/src/live555/android.patch
> +++ b/contrib/src/live555/android.patch
> @@ -1,13 +1,11 @@
> -diff -ur live555.orig/config.armlinux live555/config.armlinux
> ---- live555.orig/config.armlinux       2012-01-19 16:56:57.026348234
> -0500
> -+++ live555/config.armlinux    2012-01-19 16:57:42.806348231 -0500
> -@@ -1,5 +1,5 @@
> --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
> -+CROSS_COMPILE?=               arm-linux-androideabi-
> -+COMPILE_OPTS =     $(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -DNO_SSTREAM=1 -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -I$(ANDROID_NDK)/platforms/android-9/arch-arm/usr/include -DLOCALE_NOT_USED
> +diff -ur live555.orig/config.linux live555/config.linux
> +--- live555.orig/config.linux  2011-12-23 10:28:16.000000000 +0100
> ++++ live555/config.linux       2012-01-21 22:14:28.940821128 +0100
> +@@ -1,4 +1,4 @@
> +-COMPILE_OPTS =                $(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
> ++COMPILE_OPTS =                $(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DNO_SSTREAM=1 -I$(ANDROID_NDK)/platforms/android-9/arch-arm/usr/include -DLOCALE_NOT_USED
>   C =                   c
> - C_COMPILER =          $(CROSS_COMPILE)gcc
> + C_COMPILER =          cc
>   C_FLAGS =             $(COMPILE_OPTS)
>  diff -ur live555.orig/groupsock/GroupsockHelper.cpp
>  live555/groupsock/GroupsockHelper.cpp
>  --- live555.orig/groupsock/GroupsockHelper.cpp 2012-01-19
>  16:56:57.026348234 -0500
> diff --git a/contrib/src/live555/rules.mak
> b/contrib/src/live555/rules.mak
> index e888976..b5daf18 100644
> --- a/contrib/src/live555/rules.mak
> +++ b/contrib/src/live555/rules.mak
> @@ -23,12 +23,8 @@ endif
>  
>  LIVE_TARGET = $(error live555 target not defined!)
>  ifdef HAVE_LINUX
> -ifeq ($(ARCH),arm)
> -LIVE_TARGET := armlinux
> -else
>  LIVE_TARGET := linux
>  endif
> -endif
>  ifdef HAVE_WIN32
>  LIVE_TARGET := mingw
>  endif
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> http://mailman.videolan.org/listinfo/vlc-devel