Nginx build against zlib-1.2.4 fails

Hi,
zlib-1.2.4 has been released recently and it’s default Makefile has
changed.
It now only contains distclean target and no target named ‘clean’ before
./configure is run. Hence, nginx source build against zlib-1.2.4 fails.
Please fix this in the next release.

Thanks,
Vinay

Hello!

On Sun, Mar 21, 2010 at 09:02:03PM +0530, Vinay Y S wrote:

zlib-1.2.4 has been released recently and it’s default Makefile has changed.
It now only contains distclean target and no target named ‘clean’ before
./configure is run. Hence, nginx source build against zlib-1.2.4 fails.
Please fix this in the next release.

Patch.

Maxim D.

diff --git a/auto/lib/zlib/make b/auto/lib/zlib/make
index 4d62b75…b874b04 100644
— a/auto/lib/zlib/make
+++ b/auto/lib/zlib/make
@@ -53,7 +53,7 @@ END

$ZLIB/libz.a: $NGX_MAKEFILE
cd $ZLIB \

  •   && \$(MAKE) clean \\
    
  •   && \$(MAKE) distclean \\
      && cp contrib/asm586/match.S . \\
      && CFLAGS="$ZLIB_OPT -DASMV" CC="\$(CC)" \\
              ./configure \\
    

@@ -70,7 +70,7 @@ END

$ZLIB/libz.a: $NGX_MAKEFILE
cd $ZLIB \

  •   && \$(MAKE) clean \\
    
  •   && \$(MAKE) distclean \\
      && cp contrib/asm686/match.S . \\
      && CFLAGS="$ZLIB_OPT -DASMV" CC="\$(CC)" \\
              ./configure \\
    

@@ -103,7 +103,7 @@ if [ $done = NO ]; then

$ZLIB/libz.a: $NGX_MAKEFILE
cd $ZLIB \

  •   && \$(MAKE) clean \\
    
  •   && \$(MAKE) distclean \\
      && CFLAGS="$ZLIB_OPT" CC="\$(CC)" \\
              ./configure \\
      && \$(MAKE) libz.a
    


Vinay

Hello!

On Thu, Mar 25, 2010 at 12:13:21AM +0530, Vinay Y S wrote:

diff --git a/auto/lib/zlib/make b/auto/lib/zlib/make
index 4d62b75…b874b04 100644
— a/auto/lib/zlib/make
+++ b/auto/lib/zlib/make
@@ -53,7 +53,7 @@ END

[…]

Uhm, see no difference with the one I’ve posted. Am I missed
something?

Maxim D.

oops. I didn’t notice your patch attachment. I thought you were asking
for
the patch :-p Both are fine.