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

[Olivier Gambier]

Le 22 janv. 2012 à 10:17, Rafaël Carré a écrit :

> 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,
> 

Following Raphaël suggestion, I'm writing to the list.

Crosscompiling from osx to linux doesn't work right now, because the system ar is used.
Adding a replacement for ar to $(AR) fixes the problem as far as I can tell.
Now, I'm not privy enough with vlc build system, so what do you think?
Can this have a negative impact on something else?
Thanks!


I tested this patch, building live555 on osx for:
- llvm-gcc-4.2
- i386-mingw32-4.3.0
- gcc-4.5.2-for-linux32
- gcc-4.5.2-for-linux64



Regards,


- Olivier

PS: this patch is for the 1.2 branch, and it also contains the double-cc-osx-replacement fix

-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Fix-double-cc-replacement-and-add-ar-replacement.patch
Type: application/octet-stream
Size: 1186 bytes
Desc: not available
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20120124/6d51c547/attachment.obj>