ASF Bugzilla – Attachment 14302 Details for
Bug 33610
Patch to compile zlib-1.2.2 in windows
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Superceeded
httpd-2.0.53_zlib-1.2.2.patch (text/plain), 4.93 KB, created by
Ross Smith
on 2005-02-16 22:19:33 UTC
(
hide
)
Description:
Superceeded
Filename:
MIME Type:
Creator:
Ross Smith
Created:
2005-02-16 22:19:33 UTC
Size:
4.93 KB
patch
obsolete
>diff -uwr httpd-2.0.53/modules/filters/mod_deflate.dep httpd-2.0.53.new/modules/filters/mod_deflate.dep >--- httpd-2.0.53/modules/filters/mod_deflate.dep 2004-11-24 11:31:10.000000000 -0800 >+++ httpd-2.0.53.new/modules/filters/mod_deflate.dep 2005-02-16 09:53:32.578125000 -0800 >@@ -5,34 +5,18 @@ > "..\..\srclib\zlib\zlib.h"\ > > >-..\..\srclib\zlib\crc32.c : \ >+..\..\srclib\zlib\compress.c : \ > "..\..\srclib\zlib\zconf.h"\ > "..\..\srclib\zlib\zlib.h"\ > > >-..\..\srclib\zlib\deflate.c : \ >- "..\..\srclib\zlib\deflate.h"\ >- "..\..\srclib\zlib\zconf.h"\ >- "..\..\srclib\zlib\zlib.h"\ >- "..\..\srclib\zlib\zutil.h"\ >- >- >-..\..\srclib\zlib\infblock.c : \ >- "..\..\srclib\zlib\infblock.h"\ >- "..\..\srclib\zlib\infcodes.h"\ >- "..\..\srclib\zlib\inftrees.h"\ >- "..\..\srclib\zlib\infutil.h"\ >+..\..\srclib\zlib\crc32.c : \ > "..\..\srclib\zlib\zconf.h"\ > "..\..\srclib\zlib\zlib.h"\ >- "..\..\srclib\zlib\zutil.h"\ > > >-..\..\srclib\zlib\infcodes.c : \ >- "..\..\srclib\zlib\infblock.h"\ >- "..\..\srclib\zlib\infcodes.h"\ >- "..\..\srclib\zlib\inffast.h"\ >- "..\..\srclib\zlib\inftrees.h"\ >- "..\..\srclib\zlib\infutil.h"\ >+..\..\srclib\zlib\deflate.c : \ >+ "..\..\srclib\zlib\deflate.h"\ > "..\..\srclib\zlib\zconf.h"\ > "..\..\srclib\zlib\zlib.h"\ > "..\..\srclib\zlib\zutil.h"\ >diff -uwr httpd-2.0.53/modules/filters/mod_deflate.dsp httpd-2.0.53.new/modules/filters/mod_deflate.dsp >--- httpd-2.0.53/modules/filters/mod_deflate.dsp 2004-11-24 11:31:10.000000000 -0800 >+++ httpd-2.0.53.new/modules/filters/mod_deflate.dsp 2005-02-16 09:53:32.578125000 -0800 >@@ -96,19 +96,15 @@ > # End Source File > # Begin Source File > >-SOURCE=..\..\srclib\zlib\crc32.c >+SOURCE=..\..\srclib\zlib\compress.c > # End Source File > # Begin Source File > >-SOURCE=..\..\srclib\zlib\deflate.c >-# End Source File >-# Begin Source File >- >-SOURCE=..\..\srclib\zlib\infblock.c >+SOURCE=..\..\srclib\zlib\crc32.c > # End Source File > # Begin Source File > >-SOURCE=..\..\srclib\zlib\infcodes.c >+SOURCE=..\..\srclib\zlib\deflate.c > # End Source File > # Begin Source File > >diff -uwr httpd-2.0.53/modules/filters/mod_deflate.mak httpd-2.0.53.new/modules/filters/mod_deflate.mak >--- httpd-2.0.53/modules/filters/mod_deflate.mak 2004-11-24 11:31:10.000000000 -0800 >+++ httpd-2.0.53.new/modules/filters/mod_deflate.mak 2005-02-16 09:53:32.578125000 -0800 >@@ -49,10 +49,9 @@ > CLEAN : > !ENDIF > -@erase "$(INTDIR)\adler32.obj" >+ -@erase "$(INTDIR)\compress.obj" > -@erase "$(INTDIR)\crc32.obj" > -@erase "$(INTDIR)\deflate.obj" >- -@erase "$(INTDIR)\infblock.obj" >- -@erase "$(INTDIR)\infcodes.obj" > -@erase "$(INTDIR)\inffast.obj" > -@erase "$(INTDIR)\inflate.obj" > -@erase "$(INTDIR)\inftrees.obj" >@@ -116,10 +115,9 @@ > LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_deflate.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_deflate.so" /implib:"$(OUTDIR)\mod_deflate.lib" /base:@..\..\os\win32\BaseAddr.ref,mod_deflate.so /opt:ref > LINK32_OBJS= \ > "$(INTDIR)\adler32.obj" \ >+ "$(INTDIR)\compress.obj" \ > "$(INTDIR)\crc32.obj" \ > "$(INTDIR)\deflate.obj" \ >- "$(INTDIR)\infblock.obj" \ >- "$(INTDIR)\infcodes.obj" \ > "$(INTDIR)\inffast.obj" \ > "$(INTDIR)\inflate.obj" \ > "$(INTDIR)\inftrees.obj" \ >@@ -161,10 +159,9 @@ > CLEAN : > !ENDIF > -@erase "$(INTDIR)\adler32.obj" >+ -@erase "$(INTDIR)\compress.obj" > -@erase "$(INTDIR)\crc32.obj" > -@erase "$(INTDIR)\deflate.obj" >- -@erase "$(INTDIR)\infblock.obj" >- -@erase "$(INTDIR)\infcodes.obj" > -@erase "$(INTDIR)\inffast.obj" > -@erase "$(INTDIR)\inflate.obj" > -@erase "$(INTDIR)\inftrees.obj" >@@ -228,10 +225,9 @@ > LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_deflate.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_deflate.so" /implib:"$(OUTDIR)\mod_deflate.lib" /base:@..\..\os\win32\BaseAddr.ref,mod_deflate.so > LINK32_OBJS= \ > "$(INTDIR)\adler32.obj" \ >+ "$(INTDIR)\compress.obj" \ > "$(INTDIR)\crc32.obj" \ > "$(INTDIR)\deflate.obj" \ >- "$(INTDIR)\infblock.obj" \ >- "$(INTDIR)\infcodes.obj" \ > "$(INTDIR)\inffast.obj" \ > "$(INTDIR)\inflate.obj" \ > "$(INTDIR)\inftrees.obj" \ >@@ -268,27 +264,21 @@ > $(CPP) $(CPP_PROJ) $(SOURCE) > > >-SOURCE=..\..\srclib\zlib\crc32.c >- >-"$(INTDIR)\crc32.obj" : $(SOURCE) "$(INTDIR)" >- $(CPP) $(CPP_PROJ) $(SOURCE) >- >- >-SOURCE=..\..\srclib\zlib\deflate.c >+SOURCE=..\..\srclib\zlib\compress.c > >-"$(INTDIR)\deflate.obj" : $(SOURCE) "$(INTDIR)" >+"$(INTDIR)\compress.obj" : $(SOURCE) "$(INTDIR)" > $(CPP) $(CPP_PROJ) $(SOURCE) > > >-SOURCE=..\..\srclib\zlib\infblock.c >+SOURCE=..\..\srclib\zlib\crc32.c > >-"$(INTDIR)\infblock.obj" : $(SOURCE) "$(INTDIR)" >+"$(INTDIR)\crc32.obj" : $(SOURCE) "$(INTDIR)" > $(CPP) $(CPP_PROJ) $(SOURCE) > > >-SOURCE=..\..\srclib\zlib\infcodes.c >+SOURCE=..\..\srclib\zlib\deflate.c > >-"$(INTDIR)\infcodes.obj" : $(SOURCE) "$(INTDIR)" >+"$(INTDIR)\deflate.obj" : $(SOURCE) "$(INTDIR)" > $(CPP) $(CPP_PROJ) $(SOURCE) > >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 33610
:
14302
|
14304