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

[Rafaël Carré]

Le 2012-01-21 09:56, Jean-Baptiste Kempf a écrit :
> On Fri, Jan 20, 2012 at 06:40:57PM -0500, Rafaël Carré wrote :
>>  contrib/src/live555/rules.mak |    4 ++--
>>  1 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/contrib/src/live555/rules.mak b/contrib/src/live555/rules.mak
>> index d90c9b7..b5daf18 100644
>> --- a/contrib/src/live555/rules.mak
>> +++ b/contrib/src/live555/rules.mak
>> @@ -42,10 +42,10 @@ endif
>>  ifdef HAVE_MACOSX
>>  	cd $< && sed -i.orig -e s/"libtool -s -o"/"ar cr"/g config.macosx*
>>  endif
>> +	cd $< && sed -e 's%cc%$(CC)%' -e 's%c++%$(CXX)%' -i.orig config.$(LIVE_TARGET)
>>  	cd $< && sed \
>>  		-e 's%-DBSD=1%-DBSD=1\ $(EXTRA_CFLAGS)\ $(EXTRA_LDFLAGS)%' \
>> -		-e 's%cc%$(CC)%' \
>> -		-e 's%c++%$(CXX)\ $(EXTRA_LDFLAGS)%' \
>> +		-e 's%$(CXX)%$(CXX)\ $(EXTRA_LDFLAGS)%' \
>>  		-i.orig config.macosx
>>  	cd $< && sed -e 's%-D_FILE_OFFSET_BITS=64%-D_FILE_OFFSET_BITS=64\ -fPIC\ -DPIC%' -i.orig config.linux
>>  	cd $< && ./genMakefiles $(LIVE_TARGET)
> 
> I like it better, indeed.
> 
> Best regards,

There is a problem on osx when we replace $(CXX) by "$(CXX) xxx", if we
run make .live555 multiple times