Hi,

On 01.10.2013 08:11, Yuri Myasoedov wrote:
Hi, devs!

I'm confronted with some problems while building AOO 4.0.0 (r1503704) on 
Windows 7 SP1 (32-bit).
Currently, I can't build *curl* module, because of different line endings in 
patch and in original files.
I found a solution that could work [1], but it doesn't work for me. And I don't 
know why.
May be the patch was changed or my version of patch tool (2.7.1) doesn't fit 
for this solution.
I'm appreciate any help or advice.


Yes, the version 2.7.1 of cygwin patch tool breaks our Windows build. You already found the corresponding thread during the solution phase.

After the AOO 4.0.0 release I have made corresponding changes to patch files and the execution call to the patch tool to solve this issue. See the changes of revisions 1509645, 1510523, 1510959 and 1512228 (I hope this is the complete list)

In your case - as you want to build AOO 4.0.0 (rev. 1503704) - I propose you 'downgrade' your cygwin patch tool to version 2.6.1.


Best regards, Oliver.

$ unix2dos.exe ../curl/curl-7.19.7_win.patch
$ build --all:curl
build -- version: 275224

=============
Building module curl
=============

Entering /cygdrive/c/aoo/main/curl

mkout -- version: 1.8
if [ -d ./wntmsci12.pro/misc/build/curl-7.19.7 ] ; then echo "moving" && mv 
./wntmsci12.pro/misc/build/curl-7.19.7 ./wntmsci12.pro/misc/build/curl-7.19.7_removeme ; fi
make writeable...
patching file curl-7.19.7/configure
patching file curl-7.19.7/lib/setup.h
patching file curl-7.19.7/ltmain.sh
patching file curl-7.19.7/lib/ssh.c
patching file curl-7.19.7/lib/Makefile.vc9
Hunk #1 FAILED at 46 (different line endings).
1 out of 1 hunk FAILED -- saving rejects to file 
curl-7.19.7/lib/Makefile.vc9.rej
dmake:  Error code 1, while making 
'./wntmsci12.pro/misc/build/so_patched_so_curl'

[1] 
http://t156370.apache-incubator-ooo-development.apachetalk.us/build-breaks-in-curl-t156370.html

---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to