[merge][1.15.1 please] using zdll on Windows to build _chk_map_pyx extension

[Alexander Belchenko]

Done in attached patch.

Is it possible to have this patch in 1.15.1, please?

Robert Collins пишет:
> How about
> 
> 
>> === modified file 'setup.py'
>> --- setup.py	2009-05-23 04:55:52 +0000
>> +++ setup.py	2009-05-28 10:05:29 +0000
>> @@ -265,11 +265,11 @@
>>  add_pyrex_extension('bzrlib._chunks_to_lines_pyx')
>>  add_pyrex_extension('bzrlib._knit_load_data_c')
>>  add_pyrex_extension('bzrlib._rio_pyx')
>> -add_pyrex_extension('bzrlib._chk_map_pyx', libraries=['z'])
>>  if sys.platform == 'win32':
>>      add_pyrex_extension('bzrlib._dirstate_helpers_c',
>>                          libraries=['Ws2_32'])
>>      add_pyrex_extension('bzrlib._walkdirs_win32')
>> +     zlib = 'zdll'
>>  else:
>>      if have_pyrex and pyrex_version == '0.9.4.1':
>>          # Pyrex 0.9.4.1 fails to compile this extension correctly
>> @@ -284,6 +284,7 @@
>>      else:
>>          add_pyrex_extension('bzrlib._dirstate_helpers_c')
>>      add_pyrex_extension('bzrlib._readdir_pyx')
>> +    zlib = 'z'
>>  ext_modules.append(Extension('bzrlib._patiencediff_c', ['bzrlib/_patiencediff_c.c']))
>> +add_pyrex_extension('bzrlib._chk_map_pyx', libraries=[zlib])
> 
> Instead? This reduces duplication if we do change some other aspects
> later.
> 
> -Rob

-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: zlib-v2.patch
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20090601/9fb52f50/attachment-0001.diff