Changes between Initial Version and Version 1 of Ticket #2473


Ignore:
Timestamp:
03/22/23 09:55:46 (20 months ago)
Author:
bullerdu@…
Comment:

I tried to fix the problem, as follows:

# HG changeset patch
# User Buller Du <duyefei@outlook.com>
# Date 1679478784 -28800
#      Wed Mar 22 17:53:04 2023 +0800
# Node ID aa8d7c65ac5687971fe94d220d07f3d9237ba411
# Parent  8771d35d55d0a2b1cefaab04401d6f837f5a05a2
Gzip: Compatible to compile zlib-ng

diff -r 8771d35d55d0 -r aa8d7c65ac56 auto/lib/zlib/conf
--- a/auto/lib/zlib/conf        Fri Mar 10 07:43:50 2023 +0300
+++ b/auto/lib/zlib/conf        Wed Mar 22 17:53:04 2023 +0800
@@ -35,6 +35,7 @@
             have=NGX_ZLIB . auto/have
             LINK_DEPS="$LINK_DEPS $ZLIB/libz.a"
             CORE_LIBS="$CORE_LIBS $ZLIB/libz.a"
+            CORE_DEPS="$CORE_DEPS $ZLIB/zlib.h"
             #CORE_LIBS="$CORE_LIBS -L $ZLIB -lz"
         ;;

diff -r 8771d35d55d0 -r aa8d7c65ac56 auto/lib/zlib/make
--- a/auto/lib/zlib/make        Fri Mar 10 07:43:50 2023 +0300
+++ b/auto/lib/zlib/make        Wed Mar 22 17:53:04 2023 +0800
@@ -50,9 +50,11 @@

             cat << END                                        >> $NGX_MAKEFILE

+$ZLIB/zlib.h:  $NGX_MAKEFILE
+
 $ZLIB/libz.a:  $NGX_MAKEFILE
        cd $ZLIB \\
-       && \$(MAKE) distclean \\
+       && if [ -f Makefile ]; then \$(MAKE) distclean; fi \\
        && \$(MAKE) -f win32/Makefile.gcc \\
                CFLAGS="$ZLIB_OPT" CC="\$(CC)" \\
                libz.a
@@ -73,9 +75,11 @@

                 cat << END                                    >> $NGX_MAKEFILE

+$ZLIB/zlib.h:  $NGX_MAKEFILE
+
 $ZLIB/libz.a:  $NGX_MAKEFILE
        cd $ZLIB \\
-       && \$(MAKE) distclean \\
+       && if [ -f Makefile ]; then \$(MAKE) distclean; fi \\
        && cp contrib/asm586/match.S . \\
        && CFLAGS="$ZLIB_OPT -DASMV" CC="\$(CC)" \\
                ./configure \\
@@ -90,9 +94,11 @@

                 cat << END                                    >> $NGX_MAKEFILE

+$ZLIB/zlib.h:  $NGX_MAKEFILE
+
 $ZLIB/libz.a:  $NGX_MAKEFILE
        cd $ZLIB \\
-       && \$(MAKE) distclean \\
+       && if [ -f Makefile ]; then \$(MAKE) distclean; fi \\
        && cp contrib/asm686/match.S . \\
        && CFLAGS="$ZLIB_OPT -DASMV" CC="\$(CC)" \\
                ./configure \\
@@ -123,9 +129,11 @@

     cat << END                                                >> $NGX_MAKEFILE

+$ZLIB/zlib.h:  $NGX_MAKEFILE
+
 $ZLIB/libz.a:  $NGX_MAKEFILE
        cd $ZLIB \\
-       && \$(MAKE) distclean \\
+       && if [ -f Makefile ]; then \$(MAKE) distclean; fi \\
        && CFLAGS="$ZLIB_OPT" CC="\$(CC)" \\
                ./configure \\
        && \$(MAKE) libz.a

Legend:

Unmodified
Added
Removed
Modified