projects / libreoffice.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8583a9c)
no-openssl
authorDebian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Mon, 29 Jan 2018 17:52:54 +0000 (17:52 +0000)
committerRene Engelhard <rene@debian.org>
Mon, 29 Jan 2018 17:52:54 +0000 (17:52 +0000)
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 dd5673901bcedbfa9bfcb2b0a99e44ef84d3ff26..717b59233f4d547380e02812d21deb4efd303913 100644 (file)
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1482,75 +1482,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
@@ -3033,9 +2964,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 6040362941d60d886aa6a88307ae15ef1657c9d6..442aa5dc7be6b91412b1f1a1e3ba6d63115e9964 100644 (file)
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -97,7 +97,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@
@@ -419,8 +418,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 ORCUS_CFLAGS=$(gb_SPACE)@ORCUS_CFLAGS@
 export ORCUS_LIBS=$(gb_SPACE)@ORCUS_LIBS@
 export OS=@OS@
@@ -555,7 +552,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 c3d94c4365a39dbe41fbf6e3c557dfb819e30726..f991c3dc14972822269603b739ff7b85f6ac78ca 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 53cebd01a242d3b73f8e3d236edd4b0fddd71fb1..e18e6543e62dd6982f23066bad123003e897a81e 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 59c709838e0fa731bc9cfc66fcef6c801c6155a7..462b0d7c703ac0fa057f8d3171cff357bdec2e9f 100644 (file)
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -77,7 +77,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 a21157be131f9a506ba55f4a53d7a65e2b5350c1..d5ce09d38ebad7d2f97d40a4cb91e6be1f1b3eac 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 f4afd730c74c2d97c59774309d217bc413f5ea39..7016cf223d95a204a0f0a85b3517292fbfd05ba6 100644 (file)
--- a/ucb/Library_ucpdav1.mk
+++ b/ucb/Library_ucpdav1.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Library_use_externals,ucpdav1,\
        boost_headers \
        libxml2 \
        neon \
-       openssl \
 ))
 
 $(eval $(call gb_Library_use_custom_headers,ucpdav1,\
@@ -72,7 +71,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.