[libreoffice] 02/11: use bigger hammer in patches/no-openssl.diff
Rene Engelhard
rene at moszumanska.debian.org
Tue Nov 15 21:57:24 UTC 2016
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 5d45d4b5fb261011a63ecde945f696482d1ba6a4
Author: Rene Engelhard <rene at debian.org>
Date: Thu Nov 3 20:20:20 2016 +0100
use bigger hammer in patches/no-openssl.diff
---
patches/no-openssl.diff | 215 ++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 215 insertions(+)
diff --git a/patches/no-openssl.diff b/patches/no-openssl.diff
index b2e6ae7..95290e9 100644
--- a/patches/no-openssl.diff
+++ b/patches/no-openssl.diff
@@ -116,3 +116,218 @@ index 3862386..45d5e25 100644
dnl Check for building gnutls
dnl ===================================================================
AC_MSG_CHECKING([whether to use gnutls])
+
+.. and without these gbuild still wants it ...
+
+diff --git a/external/Module_external.mk b/external/Module_external.mk
+index 44280e3..44c1c63 100644
+--- a/external/Module_external.mk
++++ b/external/Module_external.mk
+@@ -82,7 +82,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\
+ $(call gb_Helper_optional,ODFGEN,libodfgen) \
+ $(call gb_Helper_optional,OPENCOLLADA,opencollada) \
+ $(call gb_Helper_optional,OPENLDAP,openldap) \
+- $(call gb_Helper_optional,OPENSSL,openssl) \
+ $(call gb_Helper_optional,ORCUS,liborcus) \
+ $(call gb_Helper_optional,OWNCLOUD_ANDROID_LIB,owncloud-android-lib) \
+ $(call gb_Helper_optional,PAGEMAKER,libpagemaker) \
+diff --git a/oox/CppunitTest_oox_tokenmap.mk b/oox/CppunitTest_oox_tokenmap.mk
+index 9eac2a5..ef6d5c9 100644
+--- a/oox/CppunitTest_oox_tokenmap.mk
++++ b/oox/CppunitTest_oox_tokenmap.mk
+@@ -23,19 +23,10 @@ $(eval $(call gb_CppunitTest_use_api,oox_tokenmap,\
+
+ $(eval $(call gb_CppunitTest_use_library_objects,oox_tokenmap,oox))
+
+-ifeq ($(TLS),OPENSSL)
+-$(eval $(call gb_CppunitTest_use_externals,oox_tokenmap,\
+- openssl \
+- openssl_headers \
+-))
+-else
+-ifeq ($(TLS),NSS)
+ $(eval $(call gb_CppunitTest_use_externals,oox_tokenmap,\
+ plc4 \
+ nss3 \
+ ))
+-endif
+-endif
+
+ $(eval $(call gb_CppunitTest_use_libraries,oox_tokenmap,\
+ basegfx \
+diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
+index fcd7215..a178883 100644
+--- a/oox/Library_oox.mk
++++ b/oox/Library_oox.mk
+@@ -67,19 +67,10 @@ $(eval $(call gb_Library_use_externals,oox,\
+ boost_headers \
+ ))
+
+-ifeq ($(TLS),OPENSSL)
+-$(eval $(call gb_Library_use_externals,oox,\
+- openssl \
+- openssl_headers \
+-))
+-else
+-ifeq ($(TLS),NSS)
+ $(eval $(call gb_Library_use_externals,oox,\
+ plc4 \
+ nss3 \
+ ))
+-endif
+-endif
+
+ $(eval $(call gb_Library_set_componentfile,oox,oox/util/oox))
+
+diff --git a/ucb/CppunitTest_ucb_webdav_local_neon.mk b/ucb/CppunitTest_ucb_webdav_local_neon.mk
+index 20e827b..9b869f9 100644
+--- a/ucb/CppunitTest_ucb_webdav_local_neon.mk
++++ b/ucb/CppunitTest_ucb_webdav_local_neon.mk
+@@ -34,7 +34,6 @@ $(eval $(call gb_CppunitTest_use_externals,ucb_webdav_local_neon,\
+ boost_headers \
+ libxml2 \
+ neon \
+- openssl \
+ ))
+
+ $(eval $(call gb_CppunitTest_use_custom_headers,ucb_webdav_local_neon,\
+diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk
+index 37f3c8f..2167dd2 100644
+--- a/ucb/Library_ucpdav1.mk
++++ b/ucb/Library_ucpdav1.mk
+@@ -30,7 +30,6 @@ $(eval $(call gb_Library_use_externals,ucpdav1,\
+ boost_headers \
+ libxml2 \
+ neon \
+- openssl \
+ ))
+
+ $(eval $(call gb_Library_use_custom_headers,ucpdav1,\
+@@ -66,7 +65,6 @@ else # WITH_WEBDAV == serf
+ $(eval $(call gb_Library_use_externals,ucpdav1,\
+ boost_headers \
+ apr \
+- openssl \
+ serf \
+ zlib \
+ ))
+diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk
+index 65b3cfc..8217bc1 100644
+--- a/xmlsecurity/Library_xsec_xmlsec.mk
++++ b/xmlsecurity/Library_xsec_xmlsec.mk
+@@ -104,22 +104,10 @@ $(eval $(call gb_Library_add_defs,xsec_xmlsec,\
+ -DXMLSEC_CRYPTO_NSS \
+ ))
+
+-ifeq ($(OS)-$(COM),WNT-GCC)
+-$(eval $(call gb_Library_add_libs,xsec_xmlsec,\
+- $(call gb_UnpackedTarball_get_dir,xmlsec)/src/nss/.libs/libxmlsec1-nss.dll.a \
+- $(call gb_UnpackedTarball_get_dir,xmlsec)/src/.libs/libxmlsec1.dll.a \
+-))
+-else ifeq ($(OS),ANDROID)
+-$(eval $(call gb_Library_add_libs,xsec_xmlsec,\
+- $(call gb_UnpackedTarball_get_dir,xmlsec)/src/openssl/.libs/libxmlsec1-openssl.a \
+- $(call gb_UnpackedTarball_get_dir,xmlsec)/src/.libs/libxmlsec1.a \
+-))
+-else
+ $(eval $(call gb_Library_add_libs,xsec_xmlsec,\
+ $(call gb_UnpackedTarball_get_dir,xmlsec)/src/nss/.libs/libxmlsec1-nss.a \
+ $(call gb_UnpackedTarball_get_dir,xmlsec)/src/.libs/libxmlsec1.a \
+ ))
+-endif
+
+ $(eval $(call gb_Library_use_externals,xsec_xmlsec,\
+ plc4 \
+diff --git a/external/libxmlsec/ExternalProject_xmlsec.mk b/external/libxmlsec/ExternalProject_xmlsec.mk
+index 9259f01..a85653f 100644
+--- a/external/libxmlsec/ExternalProject_xmlsec.mk
++++ b/external/libxmlsec/ExternalProject_xmlsec.mk
+@@ -13,8 +13,6 @@ $(eval $(call gb_ExternalProject_use_external,xmlsec,libxml2))
+
+ $(eval $(call gb_ExternalProject_use_external,xmlsec,nss3))
+
+-$(eval $(call gb_ExternalProject_use_external,xmlsec,openssl))
+-
+ $(eval $(call gb_ExternalProject_register_targets,xmlsec,\
+ build \
+ ))
+diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
+index 0fc7d25..fe5a208 100644
+--- a/RepositoryExternal.mk
++++ b/RepositoryExternal.mk
+@@ -1525,75 +1525,6 @@ endif # ENABLE_HARFBUZZ
+
+ ifeq ($(DISABLE_OPENSSL),TRUE)
+
+-gb_ExternalProject__use_openssl:=
+-gb_LinkTarget__use_openssl_headers:=
+-gb_LinkTarget__use_openssl:=
+-
+-else # !DISABLE_OPENSSL
+-
+-ifneq ($(SYSTEM_OPENSSL),)
+-
+-gb_LinkTarget__use_openssl_headers:=
+-gb_ExternalProject__use_openssl:=
+-
+-define gb_LinkTarget__use_openssl
+-$(call gb_LinkTarget_set_include,$(1),\
+- $$(INCLUDE) \
+- $(OPENSSL_CFLAGS) \
+-)
+-$(call gb_LinkTarget_add_libs,$(1),$(OPENSSL_LIBS))
+-
+-endef
+-
+-else # !SYSTEM_OPENSSL
+-
+-$(eval $(call gb_Helper_register_packages_for_install,ooo, \
+- openssl \
+-))
+-
+-define gb_ExternalProject__use_openssl
+-$(call gb_ExternalProject_use_package,$(1),openssl)
+-
+-endef
+-
+-define gb_LinkTarget__use_openssl_headers
+-$(call gb_LinkTarget_use_external_project,$(1),openssl)
+-$(call gb_LinkTarget_set_include,$(1),\
+- -I$(call gb_UnpackedTarball_get_dir,openssl)/include \
+- $$(INCLUDE) \
+-)
+-
+-endef
+-
+-define gb_LinkTarget__use_openssl
+-$(call gb_LinkTarget_use_package,$(1),openssl)
+-ifeq ($(OS),WNT)
+-$(call gb_LinkTarget_add_libs,$(1),\
+- $(call gb_UnpackedTarball_get_dir,openssl)/out32dll/ssleay32.lib \
+- $(call gb_UnpackedTarball_get_dir,openssl)/out32dll/libeay32.lib \
+-)
+-else
+-$(call gb_LinkTarget_add_libs,$(1),\
+- $(call gb_UnpackedTarball_get_dir,openssl)/libssl.a \
+- $(call gb_UnpackedTarball_get_dir,openssl)/libcrypto.a \
+-)
+-$(call gb_LinkTarget_use_external_project,$(1),openssl)
+-ifeq ($(OS),SOLARIS)
+-$(call gb_LinkTarget_add_libs,$(1),\
+- -lnsl \
+- -lsocket \
+-)
+-endif
+-endif
+-
+-endef
+-
+-endif # SYSTEM_OPENSSL
+-endif # DISABLE_OPENSSL
+-
+-
+-ifeq ($(DISABLE_OPENSSL),TRUE)
+-
+ define gb_LinkTarget__use_gnutls
+ $(call gb_LinkTarget_set_include,$(1),\
+ $$(INCLUDE) \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
More information about the Pkg-openoffice-commits
mailing list