forked from amazingfate/loongoffice
5fb8a05021
...whose (static) library is called "zlib" instead of just "z". (I ran into this when trying to do a 32-bit Linux build in a 64-bit environment, with only very limited 32-bit support installed in the system.) Change-Id: I9286975917ddf643a22803561677af035e66fb98 Reviewed-on: https://gerrit.libreoffice.org/28964 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
47 lines
1.7 KiB
Plaintext
47 lines
1.7 KiB
Plaintext
--- 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
|
|
@@ -1379,13 +1379,13 @@
|
|
version = line.split()[2]
|
|
break
|
|
if version >= version_req:
|
|
- if (self.compiler.find_library_file(lib_dirs, 'z')):
|
|
+ if (self.compiler.find_library_file(lib_dirs, 'zlib')):
|
|
if host_platform == "darwin":
|
|
zlib_extra_link_args = ('-Wl,-search_paths_first',)
|
|
else:
|
|
zlib_extra_link_args = ()
|
|
exts.append( 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 = []
|