Hi Oöiver,
Oliver-Rainer Wittmann schrieb:
Hi,
On 06.08.2013 09:39, Regina Henschel wrote:
Hi Oliver,
Oliver-Rainer Wittmann schrieb:
Hi,
it seems that my changes for the 'patch' tool causes this build breaker.
I will have a look.
Regina: Could please run 'patch -version' and tell me which version of
'patch' is active in your environment? Thx in advance.
It is
patch 2.6.1
Thanks.
I also reproduced the build breaker in my environment having patch 2.6.1
my current solution to solve the build breaker:
- 'unix2dos main/curl/curl-7.19.7_win.patch'
- rebuild curl after removing main/curl/[platform]/
Yes, that works for me too. Building is now beyond curl.
Kind regards
Regina
Best regards, Oliver.
On 06.08.2013 01:48, Regina Henschel wrote:
Hi,
I try to build current trunk r1510523 and get the error:
=============
Building module curl
=============
Entering /cygdrive/c/AOO_2013_08_05/trunk/main/curl
patching file curl-7.19.7/configure
Reversed (or previously applied) patch detected! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
3 out of 3 hunks ignored -- saving rejects to file
curl-7.19.7/configure.rej
patching file curl-7.19.7/lib/setup.h
Reversed (or previously applied) patch detected! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file
curl-7.19.7/lib/setup.h.rej
patching file curl-7.19.7/ltmain.sh
Reversed (or previously applied) patch detected! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
2 out of 2 hunks ignored -- saving rejects to file
curl-7.19.7/ltmain.sh.rej
patching file curl-7.19.7/lib/ssh.c
Reversed (or previously applied) patch detected! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
2 out of 2 hunks ignored -- saving rejects to file
curl-7.19.7/lib/ssh.c.rej
patching file curl-7.19.7/lib/Makefile.vc9
Hunk #1 FAILED at 46.
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/misc/build/so_patched_so_curl'
1 module(s):
curl
need(s) to be rebuilt
My configure is
./configure \
--with-directx-home="/cygdrive/c/Program Files/Microsoft DirectX SDK
(June 2010)" \
--with-cl-home="/cygdrive/c/Program Files/Microsoft Visual Studio
9.0/VC" \
--disable-build-mozilla \
--disable-activex \
--with-mozilla-build="/cygdrive/c/mozillabuild" \
--enable-dbgutil \
--with-asm-home="/cygdrive/c/Program Files/Microsoft Visual Studio
9.0/VC/bin" \
--with-jdk-home="/cygdrive/c/Program Files/Java/jdk1.6.0_38" \
--with-ant-home=/ant \
--with-mspdb-path="/cygdrive/c/Program Files/Microsoft Visual Studio
9.0/Common7/IDE" \
--without-junit \
--with-dmake-url="http://dmake.apache-extras.org.codespot.com/files/dmake-4.12.tar.bz2";
\
--without-fonts \
--with-atl-include-dir="/cygdrive/c/WinDDK/7600.16385.1/inc/atl71" \
--with-atl-lib-dir="/cygdrive/c/WinDDK/7600.16385.1/lib/ATL/i386" \
--with-mfc-include-dir="/cygdrive/c/WinDDK/7600.16385.1/inc/mfc42" \
--with-mfc-lib-dir="/cygdrive/c/WinDDK/7600.16385.1/lib/Mfc/i386" \
--with-lang="de en kid" \
--enable-category-b \
--with-vendor="Regina_Henschel" \
--with-build-version="r1510523_debug_category_b"
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org
For additional commands, e-mail: dev-h...@openoffice.apache.org
