[Libreoffice-commits] core.git: 4 commits - external/cairo external/postgresql external/python3 RepositoryExternal.mk
David Tardon
dtardon at redhat.com
Fri Nov 4 15:24:04 UTC 2016
RepositoryExternal.mk | 4 ++-
external/cairo/ExternalProject_cairo.mk | 7 ++++-
external/postgresql/ExternalProject_postgresql.mk | 4 +++
external/postgresql/UnpackedTarball_postgresql.mk | 6 ++++
external/postgresql/internal-zlib.patch.1 | 29 ++++++++++++++++++++++
external/python3/ExternalProject_python3.mk | 1
external/python3/internal-zlib.patch.0 | 9 ++++++
7 files changed, 58 insertions(+), 2 deletions(-)
New commits:
commit 6287b17ce78424ce2cc364761c7605e35f3cc80a
Author: David Tardon <dtardon at redhat.com>
Date: Thu Nov 3 17:38:23 2016 +0100
fix build of postgresql with bundled zlib
Change-Id: I8a1a8b8e1437d79d4c262cb8521a1239c250699e
diff --git a/external/postgresql/ExternalProject_postgresql.mk b/external/postgresql/ExternalProject_postgresql.mk
index 42fa12f..1148111 100644
--- a/external/postgresql/ExternalProject_postgresql.mk
+++ b/external/postgresql/ExternalProject_postgresql.mk
@@ -31,6 +31,10 @@ else
postgresql_CPPFLAGS := $(ZLIB_CFLAGS)
postgresql_LDFLAGS :=
+ifeq ($(SYSTEM_ZLIB),)
+postgresql_LDFLAGS += $(ZLIB_LIBS)
+endif
+
ifeq ($(DISABLE_OPENSSL),)
ifeq ($(SYSTEM_OPENSSL),)
postgresql_CPPFLAGS += -I$(call gb_UnpackedTarball_get_dir,openssl)/include
diff --git a/external/postgresql/UnpackedTarball_postgresql.mk b/external/postgresql/UnpackedTarball_postgresql.mk
index 3d0fe6c..2e41bf6 100644
--- a/external/postgresql/UnpackedTarball_postgresql.mk
+++ b/external/postgresql/UnpackedTarball_postgresql.mk
@@ -19,4 +19,10 @@ $(eval $(call gb_UnpackedTarball_add_patches,postgresql, \
external/postgresql/postgresql-9.2.1-libreoffice.patch \
))
+ifeq ($(SYSTEM_ZLIB),)
+$(eval $(call gb_UnpackedTarball_add_patches,postgresql, \
+ external/postgresql/internal-zlib.patch.1 \
+))
+endif
+
# vim: set noet sw=4 ts=4:
diff --git a/external/postgresql/internal-zlib.patch.1 b/external/postgresql/internal-zlib.patch.1
new file mode 100644
index 0000000..ac2b728
--- /dev/null
+++ b/external/postgresql/internal-zlib.patch.1
@@ -0,0 +1,29 @@
+diff -up postgresql/configure.dt postgresql/configure
+--- postgresql/configure.dt 2016-11-03 17:34:17.282388226 +0100
++++ postgresql/configure 2016-11-03 17:34:35.004202484 +0100
+@@ -8566,13 +8566,13 @@ fi
+
+ if test "$with_zlib" = yes; then
+
+-{ $as_echo "$as_me:$LINENO: checking for inflate in -lz" >&5
+-$as_echo_n "checking for inflate in -lz... " >&6; }
++{ $as_echo "$as_me:$LINENO: checking for inflate in -lzlib" >&5
++$as_echo_n "checking for inflate in -lzlib... " >&6; }
+ if test "${ac_cv_lib_z_inflate+set}" = set; then
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lz $LIBS"
++LIBS="-lzlib $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -8636,7 +8636,7 @@ if test "x$ac_cv_lib_z_inflate" = x""yes
+ #define HAVE_LIBZ 1
+ _ACEOF
+
+- LIBS="-lz $LIBS"
++ LIBS="-lzlib $LIBS"
+
+ else
+ { { $as_echo "$as_me:$LINENO: error: zlib library not found
commit b5c566fd1028cf804522e90d2674acf140f52933
Author: David Tardon <dtardon at redhat.com>
Date: Thu Nov 3 17:23:56 2016 +0100
fix external def for graphite
Change-Id: I474a7852647fc17597ec3d5a44e1e8dfdc78c0c3
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index e4f592d..b52927a 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1396,7 +1396,9 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
endef
define gb_ExternalProject__use_graphite
-$(call gb_ExternalProject_use_external_project,$(1),graphite)
+$(call gb_ExternalProject_use_static_libraries,$(1),\
+ graphite \
+)
endef
endif # SYSTEM_GRAPHITE
commit b2c16b3563a4a8e4b54f6fc0cb1be597e7c5b27d
Author: David Tardon <dtardon at redhat.com>
Date: Thu Nov 3 17:16:29 2016 +0100
fix build of bundled python3 with bundled zlib
Change-Id: I383a04ea926187263b1d7e11c548817fa9ca3fb6
diff --git a/external/python3/ExternalProject_python3.mk b/external/python3/ExternalProject_python3.mk
index ef9246e..fefdd1a 100644
--- a/external/python3/ExternalProject_python3.mk
+++ b/external/python3/ExternalProject_python3.mk
@@ -99,6 +99,7 @@ $(call gb_ExternalProject_get_state_target,python3,build) :
)" \
&& MAKEFLAGS= $(MAKE) \
$(if $(filter MACOSX,$(OS)),DESTDIR=$(EXTERNAL_WORKDIR)/python-inst install) \
+ $(if $(SYSTEM_ZLIB),,ZLIB_INCDIR=$(WORKDIR)/UnpackedTarball/zlib) \
&& ln -s build/lib.* LO_lib \
)
diff --git a/external/python3/internal-zlib.patch.0 b/external/python3/internal-zlib.patch.0
index d045f46..abe2630 100644
--- a/external/python3/internal-zlib.patch.0
+++ b/external/python3/internal-zlib.patch.0
@@ -19,6 +19,15 @@
--- 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', [], 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
commit c9fdaa1d2108686cb399122dd665584bb7343a0c
Author: David Tardon <dtardon at redhat.com>
Date: Thu Nov 3 16:36:50 2016 +0100
fix external deps for cairo
Change-Id: Iba03576ee9a114ea8dc20d8ff70a953e11c6d3e7
diff --git a/external/cairo/ExternalProject_cairo.mk b/external/cairo/ExternalProject_cairo.mk
index b983ad1..71315b2 100644
--- a/external/cairo/ExternalProject_cairo.mk
+++ b/external/cairo/ExternalProject_cairo.mk
@@ -11,6 +11,11 @@ $(eval $(call gb_ExternalProject_ExternalProject,cairo))
$(eval $(call gb_ExternalProject_use_external_project,cairo,pixman))
+$(eval $(call gb_ExternalProject_use_externals,cairo,\
+ png \
+ zlib \
+))
+
ifeq ($(OS),ANDROID)
$(eval $(call gb_ExternalProject_use_unpacked,cairo,fontconfig))
$(eval $(call gb_ExternalProject_use_unpacked,cairo,png))
@@ -40,9 +45,9 @@ $(call gb_ExternalProject_get_state_target,cairo,build) :
$(if $(filter ANDROID IOS,$(OS)),CFLAGS="$(if $(debug),-g) $(ZLIB_CFLAGS) $(gb_VISIBILITY_FLAGS)") \
$(if $(filter-out ANDROID IOS,$(OS)),CFLAGS="$(if $(debug),-g) $(ZLIB_CFLAGS)" ) \
$(if $(filter ANDROID IOS,$(OS)),PKG_CONFIG=./dummy_pkg_config) \
+ LDFLAGS="$(ZLIB_LIBS)" \
pixman_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,pixman)/pixman" \
pixman_LIBS="-L$(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs -lpixman-1" \
- ZLIB3RDLIB="$(if $(SYSTEM_ZLIB),,-L$(WORKDIR)/LinkTarget/StaticLibrary) -lz" \
png_REQUIRES="trick_configure_into_using_png_CFLAGS_and_LIBS" \
png_CFLAGS="$(LIBPNG_CFLAGS)" png_LIBS="$(LIBPNG_LIBS)" \
$(if $(SYSTEM_FREETYPE),,FREETYPE_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,freetype)/include") \
More information about the Libreoffice-commits
mailing list