Hi, I have submitted a patch for review:
https://gerrit.libreoffice.org/3826 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/26/3826/1 zlib: remove ExternalPackage_zlib Change-Id: I5bce88b2044279a6563fd68c35f9c1ac824c8850 --- M RepositoryExternal.mk M cairo/ExternalProject_cairo.mk M cairo/cairo/cairo-1.10.2.patch M clucene/UnpackedTarball_clucene.mk D clucene/patches/clucene-internal-zlib.patch M configure.ac M filter/source/flash/swfwriter1.cxx M hwpfilter/source/hgzip.h M hwpfilter/source/hiodev.cxx M liborcus/ExternalProject_liborcus.mk M package/source/zipapi/Deflater.cxx M package/source/zipapi/Inflater.cxx M postgresql/ExternalProject_postgresql.mk M sdext/source/pdfimport/pdfparse/pdfentries.cxx M sdext/source/pdfimport/test/tests.cxx M sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx M tools/source/zcodec/zcodec.cxx D zlib/ExternalPackage_zlib.mk M zlib/Module_zlib.mk 19 files changed, 18 insertions(+), 95 deletions(-) diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index f636d7b..2a58722 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -343,12 +343,8 @@ define gb_LinkTarget__use_zlib_multiarch $(if $(2),,$(call gb_Output_error,gb_LinkTarget__use_zlib_multiarch needs two arguments)) -$(call gb_LinkTarget_use_packages,$(1),\ - zlib_inc \ -) - $(call gb_LinkTarget_set_include,$(1),\ - -I$(OUTDIR)/inc/external/zlib \ + $(ZLIB_CFLAGS) \ $$(INCLUDE) \ ) @@ -369,7 +365,6 @@ endef define gb_ExternalProject__use_zlib -$(call gb_ExternalProject_use_package,$(1),zlib_inc) $(call gb_ExternalProject_use_static_libraries,$(1),zlib) endef diff --git a/cairo/ExternalProject_cairo.mk b/cairo/ExternalProject_cairo.mk index 0326b5c..4ba9023 100644 --- a/cairo/ExternalProject_cairo.mk +++ b/cairo/ExternalProject_cairo.mk @@ -32,7 +32,7 @@ $(call gb_ExternalProject_run,build,\ ./configure \ $(if $(debug),STRIP=" ") \ - CFLAGS="$(if $(debug),-g) $(SOLARINC)" \ + CFLAGS="$(if $(debug),-g) $(ZLIB_CFLAGS)" \ LDFLAGS='-L$(OUTDIR)/lib' \ $(if $(filter ANDROID IOS,$(OS)),PKG_CONFIG=./dummy_pkg_config) \ pixman_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,pixman)/pixman" \ diff --git a/cairo/cairo/cairo-1.10.2.patch b/cairo/cairo/cairo-1.10.2.patch index fce1149..9557ada 100644 --- a/cairo/cairo/cairo-1.10.2.patch +++ b/cairo/cairo/cairo-1.10.2.patch @@ -38,7 +38,7 @@ DEFAULT_CFLAGS += -I. -I$(top_srcdir) DEFAULT_CFLAGS += $(PIXMAN_CFLAGS) $(LIBPNG_CFLAGS) $(ZLIB_CFLAGS) +DEFAULT_CFLAGS += $(SOLARINC) -+DEFAULT_CFLAGS += -I$(SOLARVER)/$(INPATH)/inc/zlib -I$(SOLARVER)/$(INPATH)/inc/external/libpng -DZLIB_FIX -DDISABLE_SOME_FLOATING_POINT=1 ++DEFAULT_CFLAGS += -I$(SOLARVER)/$(INPATH)/inc/external/libpng -DZLIB_FIX -DDISABLE_SOME_FLOATING_POINT=1 CAIRO_CFLAGS = $(DEFAULT_CFLAGS) $(CFLAGS) diff --git a/clucene/UnpackedTarball_clucene.mk b/clucene/UnpackedTarball_clucene.mk index 6a32698..ed3c900 100644 --- a/clucene/UnpackedTarball_clucene.mk +++ b/clucene/UnpackedTarball_clucene.mk @@ -24,7 +24,6 @@ # http://sourceforge.net/mailarchive/message.php?msg_id=29143260 $(eval $(call gb_UnpackedTarball_add_patches,clucene,\ clucene/patches/clucene-debug.patch \ - clucene/patches/clucene-internal-zlib.patch \ clucene/patches/clucene-multimap-put.patch \ clucene/patches/clucene-narrowing-conversions.patch \ clucene/patches/clucene-nullptr.patch \ diff --git a/clucene/patches/clucene-internal-zlib.patch b/clucene/patches/clucene-internal-zlib.patch deleted file mode 100644 index 6667926..0000000 --- a/clucene/patches/clucene-internal-zlib.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- src/shared/CLucene/util/Misc.cpp 2012-02-17 15:33:09.217891100 +0000 -+++ src/shared/CLucene/util/Misc.cpp 2012-02-17 15:38:10.836597500 +0000 -@@ -34,7 +34,11 @@ - #include "CLucene/util/dirent.h" //if we have dirent, then the native one will be used - - //for zlib... --#include "zlib.h" -+#ifdef SYSTEM_ZLIB -+#include <zlib.h> -+#else -+#include <external/zlib/zlib.h> -+#endif - #if defined(MSDOS) || defined(OS2) || defined(WIN32) || defined(__CYGWIN__) - # include <fcntl.h> - # include <io.h> diff --git a/configure.ac b/configure.ac index ec0a4a6..b16ba33 100644 --- a/configure.ac +++ b/configure.ac @@ -7128,7 +7128,7 @@ AC_MSG_RESULT([internal]) SYSTEM_ZLIB=NO BUILD_TYPE="$BUILD_TYPE ZLIB" - ZLIB_CFLAGS="-I${OUTDIR}/inc/external/zlib" + ZLIB_CFLAGS="-I${WORKDIR}/UnpackedTarball/zlib" ZLIB_LIBS="-L${OUTDIR}/lib -lzlib" fi AC_SUBST(ZLIB_CFLAGS) diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx index abfb3d39..52c29b9 100644 --- a/filter/source/flash/swfwriter1.cxx +++ b/filter/source/flash/swfwriter1.cxx @@ -31,13 +31,7 @@ #include <vcl/graphicfilter.hxx> #include <vcl/graphictools.hxx> -#ifndef _ZLIB_H -#ifdef SYSTEM_ZLIB #include <zlib.h> -#else -#include <external/zlib/zlib.h> -#endif -#endif #include <vcl/salbtype.hxx> #include <basegfx/polygon/b2dpolygon.hxx> diff --git a/hwpfilter/source/hgzip.h b/hwpfilter/source/hgzip.h index 4c166af..a586cc4 100644 --- a/hwpfilter/source/hgzip.h +++ b/hwpfilter/source/hgzip.h @@ -20,12 +20,7 @@ #ifndef _HWPGZIP_H_ #define _HWPGZIP_H_ -// DVO: add zlib/ prefix -#ifdef SYSTEM_ZLIB #include <zlib.h> -#else -#include "zlib/zlib.h" -#endif class HStream; /** diff --git a/hwpfilter/source/hiodev.cxx b/hwpfilter/source/hiodev.cxx index bb367b8..5de1b5c 100644 --- a/hwpfilter/source/hiodev.cxx +++ b/hwpfilter/source/hiodev.cxx @@ -19,12 +19,7 @@ #include <stdio.h> #include <errno.h> -// DVO: add zlib/ prefix -#ifdef SYSTEM_ZLIB -#include <zlib.h> -#else -#include <zlib/zlib.h> -#endif + #ifdef WIN32 # include <io.h> #else diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk index 5d11237..6808ec3 100644 --- a/liborcus/ExternalProject_liborcus.mk +++ b/liborcus/ExternalProject_liborcus.mk @@ -46,7 +46,7 @@ liborcus_CPPFLAGS+=-DBOOST_ALL_NO_LIB endif ifeq ($(SYSTEM_ZLIB),NO) -liborcus_CPPFLAGS+=-I$(OUTDIR)/inc/external/zlib +liborcus_CPPFLAGS+=$(ZLIB_CFLAGS) endif # # OSes that use the GNU C++ library need to use -D_GLIBCXX_DEBUG in diff --git a/package/source/zipapi/Deflater.cxx b/package/source/zipapi/Deflater.cxx index dc3d344..cc79ba0 100644 --- a/package/source/zipapi/Deflater.cxx +++ b/package/source/zipapi/Deflater.cxx @@ -18,11 +18,7 @@ */ #include <package/Deflater.hxx> -#ifdef SYSTEM_ZLIB #include <zlib.h> -#else -#include <external/zlib/zlib.h> -#endif #include <com/sun/star/packages/zip/ZipConstants.hpp> #include <string.h> // for memset diff --git a/package/source/zipapi/Inflater.cxx b/package/source/zipapi/Inflater.cxx index b5ef4a2..5745cef 100644 --- a/package/source/zipapi/Inflater.cxx +++ b/package/source/zipapi/Inflater.cxx @@ -18,11 +18,7 @@ */ #include <package/Inflater.hxx> -#ifdef SYSTEM_ZLIB #include <zlib.h> -#else -#include <external/zlib/zlib.h> -#endif #include <string.h> // for memset using namespace com::sun::star::uno; diff --git a/postgresql/ExternalProject_postgresql.mk b/postgresql/ExternalProject_postgresql.mk index 76d5a01..428eded 100644 --- a/postgresql/ExternalProject_postgresql.mk +++ b/postgresql/ExternalProject_postgresql.mk @@ -11,7 +11,10 @@ $(eval $(call gb_ExternalProject_use_package,postgresql,openldap)) -$(eval $(call gb_ExternalProject_use_external,postgresql,openssl)) +$(eval $(call gb_ExternalProject_use_externals,postgresql,\ + openssl \ + zlib \ +)) $(eval $(call gb_ExternalProject_register_targets,postgresql,\ build \ @@ -34,8 +37,9 @@ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(and $(filter YES,$(WITH_KRB5)), $(filter-out YES,$(DISABLE_OPENSSL))),--with-krb5) \ $(if $(and $(filter YES,$(WITH_GSSAPI)), $(filter-out YES,$(DISABLE_OPENSSL))),--with-gssapi) \ - CPPFLAGS="$(if $(filter NO,$(SYSTEM_OPENLDAP)),\ - -I$(call gb_UnpackedTarball_get_dir,openldap/include)) \ + CPPFLAGS="$(ZLIB_CFLAGS) \ + $(if $(filter NO,$(SYSTEM_OPENLDAP)),\ + -I$(call gb_UnpackedTarball_get_dir,openldap/include)) \ $(if $(and $(filter NO,$(SYSTEM_OPENSSL)), $(filter-out YES,$(DISABLE_OPENSSL))),\ -I$(call gb_UnpackedTarball_get_dir,openssl/include))" \ $(if $(filter NO,$(SYSTEM_OPENLDAP)), \ diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/sdext/source/pdfimport/pdfparse/pdfentries.cxx index b9120ed..99243b4 100644 --- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx +++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx @@ -26,11 +26,8 @@ #include <rtl/alloc.h> #include <rtl/digest.h> #include <rtl/cipher.h> -#ifdef SYSTEM_ZLIB -#include "zlib.h" -#else -#include <zlib/zlib.h> -#endif + +#include <zlib.h> #include <math.h> #include <map> diff --git a/sdext/source/pdfimport/test/tests.cxx b/sdext/source/pdfimport/test/tests.cxx index a90010f..5ea1184 100644 --- a/sdext/source/pdfimport/test/tests.cxx +++ b/sdext/source/pdfimport/test/tests.cxx @@ -17,11 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifdef SYSTEM_ZLIB -#include "zlib.h" -#else -#include <zlib/zlib.h> -#endif +#include <zlib.h> #include "outputwrap.hxx" #include "contentsink.hxx" diff --git a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx index 2bb1123..5fb6967 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx @@ -20,12 +20,7 @@ #include "pnghelper.hxx" #include <sal/macros.h> -#ifdef SYSTEM_ZLIB -#include "zlib.h" -#else -#define ZLIB_INTERNAL 1 -#include <zlib/zlib.h> -#endif +#include <zlib.h> using namespace pdfi; diff --git a/tools/source/zcodec/zcodec.cxx b/tools/source/zcodec/zcodec.cxx index d249632..498c74d 100644 --- a/tools/source/zcodec/zcodec.cxx +++ b/tools/source/zcodec/zcodec.cxx @@ -19,13 +19,7 @@ #include <tools/stream.hxx> -#ifndef _ZLIB_H -#ifdef SYSTEM_ZLIB -#include "zlib.h" -#else -#include "zlib/zlib.h" -#endif -#endif +#include <zlib.h> #include <tools/zcodec.hxx> #include <rtl/crc.h> diff --git a/zlib/ExternalPackage_zlib.mk b/zlib/ExternalPackage_zlib.mk deleted file mode 100644 index 15571a1..0000000 --- a/zlib/ExternalPackage_zlib.mk +++ /dev/null @@ -1,17 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_ExternalPackage_ExternalPackage,zlib_inc,zlib)) - -$(eval $(call gb_ExternalPackage_add_unpacked_files,zlib_inc,inc/external/zlib,\ - zconf.h \ - zlib.h \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/zlib/Module_zlib.mk b/zlib/Module_zlib.mk index bea7375..7241df0 100644 --- a/zlib/Module_zlib.mk +++ b/zlib/Module_zlib.mk @@ -12,7 +12,6 @@ ifeq ($(SYSTEM_ZLIB),NO) $(eval $(call gb_Module_add_targets,zlib,\ - ExternalPackage_zlib \ StaticLibrary_zlib \ UnpackedTarball_zlib \ )) -- To view, visit https://gerrit.libreoffice.org/3826 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5bce88b2044279a6563fd68c35f9c1ac824c8850 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Michael Stahl <mst...@redhat.com> _______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice