external/python3/internal-zlib.patch.0

   1 --- configure
   2 +++ configure
   3 @@ -11607,13 +11607,13 @@
   4         ;;
   5  esac
   6
   7 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflateCopy in -lz" >&5
   8 -$as_echo_n "checking for inflateCopy in -lz... " >&6; }
   9 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflateCopy in -lzlib" >&5
  10 +$as_echo_n "checking for inflateCopy in -lzlib... " >&6; }
  11  if ${ac_cv_lib_z_inflateCopy+:} false; then :
  12    $as_echo_n "(cached) " >&6
  13  else
  14    ac_check_lib_save_LIBS=$LIBS
  15 -LIBS="-lz  $LIBS"
  16 +LIBS="-lzlib  $LIBS"
  17  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  18  /* end confdefs.h.  */
  19
  20 --- setup.py
  21 +++ setup.py
  22 @@ -1483,7 +1483,7 @@
  23          #
  24          # You can upgrade zlib to version 1.1.4 yourself by going to
  25          # http://www.gzip.org/zlib/
  26 -        zlib_inc = find_file('zlib.h', [], self.inc_dirs)
  27 +        zlib_inc = [os.environ.get('ZLIB_INCDIR')]
  28          have_zlib = False
  29          if zlib_inc is not None:
  30              zlib_h = zlib_inc[0] + '/zlib.h'
  31 @@ -1500,13 +1500,13 @@
  32                          version = line.split()[2]
  33                          break
  34              if version >= version_req:
  35 -                if (self.compiler.find_library_file(self.lib_dirs, 'z')):
  36 +                if (self.compiler.find_library_file(self.lib_dirs, 'zlib')):
  37                      if MACOS:
  38                          zlib_extra_link_args = ('-Wl,-search_paths_first',)
  39                      else:
  40                          zlib_extra_link_args = ()
  41                      self.add(Extension('zlib', ['zlibmodule.c'],
  42 -                                       libraries=['z'],
  43 +                                       libraries=['zlib'],
  44                                         extra_link_args=zlib_extra_link_args))
  45                      have_zlib = True
  46                  else:
  47 @@ -1520,7 +1520,7 @@
  48          # crc32 if we have it.  Otherwise binascii uses its own.
  49          if have_zlib:
  50              extra_compile_args = ['-DUSE_ZLIB_CRC32']
  51 -            libraries = ['z']
  52 +            libraries = ['zlib']
  53              extra_link_args = zlib_extra_link_args
  54          else:
  55              extra_compile_args = []