projects / libreoffice.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f5a745e)
no-openssl
authorDebian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Fri, 21 Jul 2017 09:17:32 +0000 (10:17 +0100)
committerRene Engelhard <rene@debian.org>
Fri, 21 Jul 2017 09:17:32 +0000 (10:17 +0100)
don't add -lssl etc if not needed (because we use system-postgresql)

Gbp-Pq: Name no-openssl.diff

14 files changed:
RepositoryExternal.mk patch | blob | history
config_host.mk.in patch | blob | history
configure.ac patch | blob | history
connectivity/Library_postgresql-sdbc-impl.mk patch | blob | history
external/Module_external.mk patch | blob | history
external/libxmlsec/ExternalProject_xmlsec.mk patch | blob | history
oox/CppunitTest_oox_tokenmap.mk patch | blob | history
oox/Library_oox.mk patch | blob | history
ucb/CppunitTest_ucb_webdav_local_neon.mk patch | blob | history
ucb/CppunitTest_ucb_webdav_neon_opts.mk patch | blob | history
ucb/CppunitTest_ucb_webdav_propfindcache.mk patch | blob | history
ucb/CppunitTest_ucb_webdav_res_access.mk patch | blob | history
ucb/Library_ucpdav1.mk patch | blob | history
xmlsecurity/Library_xsec_xmlsec.mk patch | blob | history

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 9049dc3e82b8b1c992de24b4f2947fd658c2d37b..cc50b73761e3d57127d93c929d2521133747945d 100644 (file)
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1488,75 +1488,6 @@ endef
 
 endif # SYSTEM_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
@@ -3001,9 +2932,10 @@ $(call gb_LinkTarget_add_libs,$(1),\
        $(call gb_UnpackedTarball_get_dir,postgresql)/src/interfaces/libpq/libpq$(gb_StaticLibrary_PLAINEXT) \
 )
 
-ifeq ($(OS)$(COM),WNTMSC)
 $(call gb_LinkTarget_use_external,$(1),openssl)
 
+ifeq ($(OS)$(COM),WNTMSC)
+
 $(call gb_LinkTarget_use_system_win32_libs,$(1),\
        secur32 \
        ws2_32 \
diff --git a/config_host.mk.in b/config_host.mk.in
index 556870bba49e79286bae91dd27d0dcf1c56bcc2e..df1d88042f6affb3fe03bbbc3b07cf50b5cf3c47 100644 (file)
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -100,7 +100,6 @@ export DISABLE_ATL=@DISABLE_ATL@
 export DISABLE_CVE_TESTS=@DISABLE_CVE_TESTS@
 export DISABLE_DYNLOADING=@DISABLE_DYNLOADING@
 export DISABLE_EXPORT=@DISABLE_EXPORT@
-export DISABLE_OPENSSL=@DISABLE_OPENSSL@
 export DISABLE_PYTHON=@DISABLE_PYTHON@
 export DLOPEN_LIBS=@DLOPEN_LIBS@
 export DLLTOOL=@DLLTOOL@
@@ -428,8 +427,6 @@ export OOO_JUNIT_JAR=@OOO_JUNIT_JAR@
 export OOO_VENDOR=@OOO_VENDOR@
 export OPENCOLLADA_CFLAGS=$(gb_SPACE)@OPENCOLLADA_CFLAGS@
 export OPENCOLLADA_LIBS=$(gb_SPACE)@OPENCOLLADA_LIBS@
-export OPENSSL_CFLAGS=$(gb_SPACE)@OPENSSL_CFLAGS@
-export OPENSSL_LIBS=$(gb_SPACE)@OPENSSL_LIBS@
 export ORCUS_CFLAGS=$(gb_SPACE)@ORCUS_CFLAGS@
 export ORCUS_LIBS=$(gb_SPACE)@ORCUS_LIBS@
 export OS=@OS@
@@ -556,7 +553,6 @@ export SYSTEM_ODBC_HEADERS=@SYSTEM_ODBC_HEADERS@
 export SYSTEM_ODFGEN=@SYSTEM_ODFGEN@
 export SYSTEM_OPENCOLLADA=@SYSTEM_OPENCOLLADA@
 export SYSTEM_OPENLDAP=@SYSTEM_OPENLDAP@
-export SYSTEM_OPENSSL=@SYSTEM_OPENSSL@
 export SYSTEM_PAGEMAKER=@SYSTEM_PAGEMAKER@
 export SYSTEM_POPPLER=@SYSTEM_POPPLER@
 export SYSTEM_POSTGRESQL=@SYSTEM_POSTGRESQL@
diff --git a/configure.ac b/configure.ac
index da2d6ae40267fe1b069ae1aab65e7802483e7dc6..4b44d6ad12a490cc69443a76875637ece6723f7a 100644 (file)
Binary files a/configure.ac and b/configure.ac differ
diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk
index 0580a8b4106de8cf823ec94ee6a132c0ff280269..7e8b778fd57401b292d585fa1cc664f52e4df40d 100644 (file)
--- a/connectivity/Library_postgresql-sdbc-impl.mk
+++ b/connectivity/Library_postgresql-sdbc-impl.mk
@@ -46,7 +46,6 @@ $(eval $(call gb_Library_use_externals,postgresql-sdbc-impl,\
        boost_headers \
        postgresql \
        $(if $(filter-out MSC,$(COM)), \
-               openssl \
                openldap \
                nss3 \
                plc4 \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 1dbf97b13265d22210bd324c31f6f3200cd8ca3d..5d536cdab2171ab021a11438d3990b7a80ad4091 100644 (file)
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -81,7 +81,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/external/libxmlsec/ExternalProject_xmlsec.mk b/external/libxmlsec/ExternalProject_xmlsec.mk
index 31708c4577ba844f4db1fcb886f392667561f5d9..f0375901df47e5b16f4085f4f9e8116b5a698408 100644 (file)
--- 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/oox/CppunitTest_oox_tokenmap.mk b/oox/CppunitTest_oox_tokenmap.mk
index 1e903a25a3680c3267ae2c3feb12cd7026e42294..aa121ad3c32a4e4dd348c6dfceb09938afb57c2f 100644 (file)
--- a/oox/CppunitTest_oox_tokenmap.mk
+++ b/oox/CppunitTest_oox_tokenmap.mk
@@ -20,19 +20,10 @@ $(eval $(call gb_CppunitTest_use_sdk_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 fcd7215c23a41a59171a75fd61cd38dbecd6b56b..a178883027d0a1e0fc3ce1edd203932e56d0f4b3 100644 (file)
--- 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 df16e36409bd53a9d8c0da06774938b754a63765..28fa821688343317c237ec36320b9bc26fe8db90 100644 (file)
--- a/ucb/CppunitTest_ucb_webdav_local_neon.mk
+++ b/ucb/CppunitTest_ucb_webdav_local_neon.mk
@@ -31,7 +31,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/CppunitTest_ucb_webdav_neon_opts.mk b/ucb/CppunitTest_ucb_webdav_neon_opts.mk
index 91e167b083a90152f34213e7eecee395f064ff4b..21e52573f86c9cc6a98af7558d40835a428ca741 100644 (file)
--- a/ucb/CppunitTest_ucb_webdav_neon_opts.mk
+++ b/ucb/CppunitTest_ucb_webdav_neon_opts.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_CppunitTest_use_externals,ucb_webdav_neon_opts,\
        boost_headers \
        libxml2 \
        neon \
-       openssl \
 ))
 
 $(eval $(call gb_CppunitTest_use_custom_headers,ucb_webdav_neon_opts,\
diff --git a/ucb/CppunitTest_ucb_webdav_propfindcache.mk b/ucb/CppunitTest_ucb_webdav_propfindcache.mk
index ebbaee7898edef80101442c62164bdc3ff308af0..e2d064ef034f9c39327ab3c61f6f56161c48d02e 100644 (file)
--- a/ucb/CppunitTest_ucb_webdav_propfindcache.mk
+++ b/ucb/CppunitTest_ucb_webdav_propfindcache.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_CppunitTest_use_externals,ucb_webdav_propfindcache,\
        boost_headers \
        libxml2 \
        neon \
-       openssl \
 ))
 
 $(eval $(call gb_CppunitTest_use_custom_headers,ucb_webdav_propfindcache,\
diff --git a/ucb/CppunitTest_ucb_webdav_res_access.mk b/ucb/CppunitTest_ucb_webdav_res_access.mk
index ac48f87bc8760a328169f244ff92a57879e6c54e..c7d151ea40df3fe19b25d7543f166e44bcbfbb77 100644 (file)
--- a/ucb/CppunitTest_ucb_webdav_res_access.mk
+++ b/ucb/CppunitTest_ucb_webdav_res_access.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_CppunitTest_use_externals,ucb_webdav_res_access,\
        boost_headers \
        libxml2 \
        neon \
-       openssl \
 ))
 
 $(eval $(call gb_CppunitTest_use_custom_headers,ucb_webdav_res_access,\
diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk
index 88306db5c469e19c66c2fd992b0aabb6b18bd88d..3e9ce3bec8c7bdd9ee7696720d3e530b9370ccfd 100644 (file)
--- 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,\
@@ -68,7 +67,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 978f7ad26a6dc8d68efc0c314e2d8ddbf418d5eb..b78eacf159b51d1e02056ac8f70de74f8305a0bc 100644 (file)
--- 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 \
Unnamed repository; edit this file 'description' to name the repository.