projects / libreoffice.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0d92ef9)
no-openssl
authorDebian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Mon, 31 Aug 2020 21:45:31 +0000 (22:45 +0100)
committerRaspbian forward porter <root@raspbian.org>
Mon, 31 Aug 2020 21:45:31 +0000 (22:45 +0100)
don't add -lssl etc if not needed (because we use system-postgresql)

Gbp-Pq: Name no-openssl.diff

12 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
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

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index e361683bcf14f89e00d27e5d3a672a883a5f978e..86e457bba2556652b6b202eb78d10178035e0b93 100644 (file)
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1558,75 +1558,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
@@ -3076,9 +3007,10 @@ $(call gb_LinkTarget_add_libs,$(1),\
        $(call gb_UnpackedTarball_get_dir,postgresql)/src/interfaces/libpq/libpq$(gb_StaticLibrary_PLAINEXT) \
 )
 
-ifeq ($(OS),WNT)
 $(call gb_LinkTarget_use_external,$(1),openssl)
 
+ifeq ($(OS),WNT)
+
 $(call gb_LinkTarget_use_system_win32_libs,$(1),\
        secur32 \
        ws2_32 \
diff --git a/config_host.mk.in b/config_host.mk.in
index 06bd4f8588e5139adc9e17f6fb006adff6dda2a9..a7e6e4df34ca0fb11c8ba0cce5f035d20d7792b3 100644 (file)
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -131,7 +131,6 @@ export DEFAULT_BRAND_IMAGES=@DEFAULT_BRAND_IMAGES@
 export DICT_SYSTEM_DIR=@DICT_SYSTEM_DIR@
 export DISABLE_CVE_TESTS=@DISABLE_CVE_TESTS@
 export DISABLE_DYNLOADING=@DISABLE_DYNLOADING@
-export DISABLE_OPENSSL=@DISABLE_OPENSSL@
 export DISABLE_PYTHON=@DISABLE_PYTHON@
 export DLOPEN_LIBS=@DLOPEN_LIBS@
 export DLLTOOL=@DLLTOOL@
@@ -453,8 +452,6 @@ export OFFICEOTRON=@OFFICEOTRON@
 export BFFVALIDATOR=@BFFVALIDATOR@
 export OOO_JUNIT_JAR=@OOO_JUNIT_JAR@
 export OOO_VENDOR=@OOO_VENDOR@
-export OPENSSL_CFLAGS=$(gb_SPACE)@OPENSSL_CFLAGS@
-export OPENSSL_LIBS=$(gb_SPACE)@OPENSSL_LIBS@
 export OPENSYMBOL_TTF=@OPENSYMBOL_TTF@
 export ORCUS_CFLAGS=$(gb_SPACE)@ORCUS_CFLAGS@
 export ORCUS_LIBS=$(gb_SPACE)@ORCUS_LIBS@
@@ -595,7 +592,6 @@ export SYSTEM_NSS=@SYSTEM_NSS@
 export SYSTEM_ODBC_HEADERS=@SYSTEM_ODBC_HEADERS@
 export SYSTEM_ODFGEN=@SYSTEM_ODFGEN@
 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 9c2729ef2445ee53dae500288c49969b4c361248..b3d9c77a07f61a55c4330b8bbc873850fb8d58c1 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 c372f3f0c6f6bed1787e16650e63415d9bd699df..0343adb24bd8089fab1527f6564c98414dbadfb1 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 \
                $(if $(ENABLE_LDAP),openldap) \
                nss3 \
                plc4 \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 28675992778169d079c119047e1e3fe2f1de97b9..50d017038caf205e45c62bcdeff924556bf33ab4 100644 (file)
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -80,7 +80,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\
        $(call gb_Helper_optional,NSS,nss) \
        $(call gb_Helper_optional,ODFGEN,libodfgen) \
        $(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 8019da7a2301977c29c952218f2408f628eccad4..0c6ab952a8131d10b2d86d358aa568c1a4293323 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,\
     avmedia \
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 287a4bb70003cae80ec4f6c6aa3f653e4d64d9f9..fc1e3d4d3cd3d98f84a2bcffca75b8d49f709abb 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 2e920f4ca03f95c90ef07dc09b38ff1f2b51fa18..a4ea2358d2fe015f8ff5dcdd5e84db556870406d 100644 (file)
--- a/ucb/CppunitTest_ucb_webdav_local_neon.mk
+++ b/ucb/CppunitTest_ucb_webdav_local_neon.mk
@@ -32,7 +32,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 df670ed7afdd0959fa4fb477d7cba7da23f3348d..020d9f9b6dd4fa9dcc042705627d28732cde707d 100644 (file)
--- a/ucb/CppunitTest_ucb_webdav_neon_opts.mk
+++ b/ucb/CppunitTest_ucb_webdav_neon_opts.mk
@@ -35,7 +35,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 8d4a12d32ad45ece2f9364b6902209c0506bbaa9..8504a0200ae7ddd7a988d4f8aa35b029713b03d7 100644 (file)
--- a/ucb/CppunitTest_ucb_webdav_propfindcache.mk
+++ b/ucb/CppunitTest_ucb_webdav_propfindcache.mk
@@ -35,7 +35,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 fa0669987bd26bd36473663f578c613d936861b4..ad25d29f945b7bc65f4d6c3357061f741a4faa88 100644 (file)
--- a/ucb/CppunitTest_ucb_webdav_res_access.mk
+++ b/ucb/CppunitTest_ucb_webdav_res_access.mk
@@ -35,7 +35,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 c76489bd48479bb496966acac6dd419a8956e3c9..2496b80c769f634037146aa0d378e2d6bed6ce24 100644 (file)
--- a/ucb/Library_ucpdav1.mk
+++ b/ucb/Library_ucpdav1.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Library_use_externals,ucpdav1,\
        boost_headers \
        libxml2 \
        neon \
-       openssl \
 ))
 
 $(eval $(call gb_Library_use_custom_headers,ucpdav1,\
@@ -73,7 +72,6 @@ else # WITH_WEBDAV == serf
 $(eval $(call gb_Library_use_externals,ucpdav1,\
        boost_headers \
        apr \
-       openssl \
        serf \
        zlib \
 ))
Unnamed repository; edit this file 'description' to name the repository.