b4dfba9477
With all the prerequisites in place, LO can be updated to the current Python release. Interestingly I found that Cygwin always seems to use LC_COLLATE=C, probably because the default collation rules are missing. Then there are the changes introduced in "PEP 587 -- Python Initialization Configuration", which appearingly have modified the DLL search path behaviour on Windows, so the OpenSLL DLLs aren't found anymore in the program directory. As a workaround, the OpenSLL and libffi DLLs are now (also) installed into the Python lib dir on Windows. Change-Id: Ib82f7b77213da9c525f8c79a13d128d9eec9ca64 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98437 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
55 lines
2 KiB
Text
55 lines
2 KiB
Text
--- configure
|
|
+++ configure
|
|
@@ -11607,13 +11607,13 @@
|
|
;;
|
|
esac
|
|
|
|
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflateCopy in -lz" >&5
|
|
-$as_echo_n "checking for inflateCopy in -lz... " >&6; }
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflateCopy in -lzlib" >&5
|
|
+$as_echo_n "checking for inflateCopy in -lzlib... " >&6; }
|
|
if ${ac_cv_lib_z_inflateCopy+:} false; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lz $LIBS"
|
|
+LIBS="-lzlib $LIBS"
|
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
--- setup.py
|
|
+++ setup.py
|
|
@@ -1362,7 +1362,7 @@
|
|
#
|
|
# You can upgrade zlib to version 1.1.4 yourself by going to
|
|
# http://www.gzip.org/zlib/
|
|
- zlib_inc = find_file('zlib.h', [], self.inc_dirs)
|
|
+ zlib_inc = [os.environ.get('ZLIB_INCDIR')]
|
|
have_zlib = False
|
|
if zlib_inc is not None:
|
|
zlib_h = zlib_inc[0] + '/zlib.h'
|
|
@@ -1379,13 +1379,13 @@
|
|
version = line.split()[2]
|
|
break
|
|
if version >= version_req:
|
|
- if (self.compiler.find_library_file(self.lib_dirs, 'z')):
|
|
+ if (self.compiler.find_library_file(self.lib_dirs, 'zlib')):
|
|
if MACOS:
|
|
zlib_extra_link_args = ('-Wl,-search_paths_first',)
|
|
else:
|
|
zlib_extra_link_args = ()
|
|
self.add(Extension('zlib', ['zlibmodule.c'],
|
|
- libraries=['z'],
|
|
+ libraries=['zlib'],
|
|
extra_link_args=zlib_extra_link_args))
|
|
have_zlib = True
|
|
else:
|
|
@@ -1399,7 +1399,7 @@
|
|
# crc32 if we have it. Otherwise binascii uses its own.
|
|
if have_zlib:
|
|
extra_compile_args = ['-DUSE_ZLIB_CRC32']
|
|
- libraries = ['z']
|
|
+ libraries = ['zlib']
|
|
extra_link_args = zlib_extra_link_args
|
|
else:
|
|
extra_compile_args = []
|