--- 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 = [] LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/bean/com/sun/star/comp/beans/NativeService.java
diff options
context:
space:
mode:
authorCaolán McNamara <caolan.mcnamara@collabora.com>2025-01-03 15:14:12 +0000
committerCaolán McNamara <caolan.mcnamara@collabora.com>2025-01-03 21:59:06 +0100
commitf4a3ffe1110aa38a3836533e6c51b910c68c2336 (patch)
tree92c906314418d3aef63a9c8d8e27d3a5a703744d /bean/com/sun/star/comp/beans/NativeService.java
parent1b93ed7991479a977ea5f91b49f90303a0d4e220 (diff)
cid#1637440 silence Using invalid iterator HEADmaster
Change-Id: Ief211a353d57fbacc9bc8e4003c0e7c68dbba626 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/179706 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>