You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by Stipe Tolj <to...@wapme-systems.de> on 2002/05/31 11:12:16 UTC
[PATCH] 1.3: Cygwin specific changes to the build process
Attached is a patch against cvs of 2002-05-28 with changes for the
Cygwin platform build process. Again, everything is designed not to
hurt other platforms.
The changes are:
* src/helpers/binbuild.sh: adding a MAKERERUN variable to run "make"
twice on Cygwin platforms while binbuild.sh is executed. This is
necessary because the we need to link shared modules against the
shared core library, which is not present throughout the first make
run, so we need to run it twice. Cygwin now has the same configure
flags in binbuild.sh as other unix flavors.
* src/helpers/install.sh: this is a long standing issue. The patch
fixes the "make install" problem we still see with .exe files. I hope
this is suitable to all for commitment.
* src/modules/standard/Makefile.Cygwin: minor text changes to
indicate we use the filename "cyghttpd.dll" instead of "libhttpd.dll"
as shared core lib.
Stipe
tolj@wapme-systems.de
-------------------------------------------------------------------
Wapme Systems AG
Münsterstr. 248
40470 Düsseldorf
Tel: +49-211-74845-0
Fax: +49-211-74845-299
E-Mail: info@wapme-systems.de
Internet: http://www.wapme-systems.de
-------------------------------------------------------------------
wapme.net - wherever you are
Re: [PATCH] 1.3: Cygwin specific changes to the build process
Posted by Jim Jagielski <ji...@jaguNET.com>.
At 10:53 AM +0200 6/2/02, Stipe Tolj wrote:
>Jim Jagielski wrote:
>>
>> At 11:12 AM +0200 5/31/02, Stipe Tolj wrote:
>> >diff -ur apache-1.3/src/helpers/install.sh apache-1.3-cygwin/src/helpers/install.sh
>> >--- apache-1.3/src/helpers/install.sh Tue Jun 12 10:24:53 2001
>> >+++ apache-1.3-cygwin/src/helpers/install.sh Tue May 28 11:15:10 2002
>> >@@ -89,12 +89,8 @@
>> >
>> > # Check if we need to add an executable extension (such as ".exe")
>> > # on specific OS to src and dst
>> >-if [ -f "$src.exe" ]; then
>> >- if [ -f "$src" ]; then
>> >- : # Cygwin [ test ] is too stupid to do [ -f "$src.exe" ] && [ ! -f "$src" ]
>> >- else
>> >- ext=".exe"
>> >- fi
>> >+if [ -f "$src.exe" ] && [ ! -f "$src." ]; then
>> >+ ext=".exe"
>> > fi
>> > src="$src$ext"
>> > dst="$dst$ext"
>>
>> Why the above change?? If [] is fixed, what about backwards compatibility?
>
>the problem is Cygwin's behaviour for the -f shell condition. I'll
>check if I can solve it on another way.
>
It's just that the comment in the present tree specifically says that
what it's being changed to doesn't work, so I'm wondering why it *is*
working now.
--
===========================================================================
Jim Jagielski [|] jim@jaguNET.com [|] http://www.jaguNET.com/
"A society that will trade a little liberty for a little order
will lose both and deserve neither" - T.Jefferson
Re: [PATCH] 1.3: Cygwin specific changes to the build process
Posted by Stipe Tolj <to...@wapme-systems.de>.
Jim Jagielski wrote:
>
> At 11:12 AM +0200 5/31/02, Stipe Tolj wrote:
> >diff -ur apache-1.3/src/helpers/install.sh apache-1.3-cygwin/src/helpers/install.sh
> >--- apache-1.3/src/helpers/install.sh Tue Jun 12 10:24:53 2001
> >+++ apache-1.3-cygwin/src/helpers/install.sh Tue May 28 11:15:10 2002
> >@@ -89,12 +89,8 @@
> >
> > # Check if we need to add an executable extension (such as ".exe")
> > # on specific OS to src and dst
> >-if [ -f "$src.exe" ]; then
> >- if [ -f "$src" ]; then
> >- : # Cygwin [ test ] is too stupid to do [ -f "$src.exe" ] && [ ! -f "$src" ]
> >- else
> >- ext=".exe"
> >- fi
> >+if [ -f "$src.exe" ] && [ ! -f "$src." ]; then
> >+ ext=".exe"
> > fi
> > src="$src$ext"
> > dst="$dst$ext"
>
> Why the above change?? If [] is fixed, what about backwards compatibility?
the problem is Cygwin's behaviour for the -f shell condition. I'll
check if I can solve it on another way.
Stipe
tolj@wapme-systems.de
-------------------------------------------------------------------
Wapme Systems AG
Münsterstr. 248
40470 Düsseldorf
Tel: +49-211-74845-0
Fax: +49-211-74845-299
E-Mail: info@wapme-systems.de
Internet: http://www.wapme-systems.de
-------------------------------------------------------------------
wapme.net - wherever you are
Re: [PATCH] 1.3: Cygwin specific changes to the build process
Posted by Jim Jagielski <ji...@jaguNET.com>.
At 11:12 AM +0200 5/31/02, Stipe Tolj wrote:
>diff -ur apache-1.3/src/helpers/install.sh apache-1.3-cygwin/src/helpers/install.sh
>--- apache-1.3/src/helpers/install.sh Tue Jun 12 10:24:53 2001
>+++ apache-1.3-cygwin/src/helpers/install.sh Tue May 28 11:15:10 2002
>@@ -89,12 +89,8 @@
>
> # Check if we need to add an executable extension (such as ".exe")
> # on specific OS to src and dst
>-if [ -f "$src.exe" ]; then
>- if [ -f "$src" ]; then
>- : # Cygwin [ test ] is too stupid to do [ -f "$src.exe" ] && [ ! -f "$src" ]
>- else
>- ext=".exe"
>- fi
>+if [ -f "$src.exe" ] && [ ! -f "$src." ]; then
>+ ext=".exe"
> fi
> src="$src$ext"
> dst="$dst$ext"
Why the above change?? If [] is fixed, what about backwards compatibility?
--
===========================================================================
Jim Jagielski [|] jim@jaguNET.com [|] http://www.jaguNET.com/
"A society that will trade a little liberty for a little order
will lose both and deserve neither" - T.Jefferson