From 76fe5ae3af014d20aa11f19bc5e27e559c2b27eb Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Sun, 26 Mar 2017 15:06:24 +0000 Subject: [PATCH] no-openssl don't add -lssl etc if not needed (because we use system-postgresql) Gbp-Pq: Name no-openssl.diff --- RepositoryExternal.mk | 72 +------------------ config_host.mk.in | 4 -- configure.ac | Bin 466052 -> 464103 bytes connectivity/Library_postgresql-sdbc-impl.mk | 1 - external/Module_external.mk | 1 - external/libxmlsec/ExternalProject_xmlsec.mk | 2 - oox/CppunitTest_oox_tokenmap.mk | 9 --- oox/Library_oox.mk | 9 --- ucb/CppunitTest_ucb_webdav_local_neon.mk | 1 - ucb/Library_ucpdav1.mk | 2 - xmlsecurity/Library_xsec_xmlsec.mk | 12 ---- 11 files changed, 2 insertions(+), 111 deletions(-) diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 1932edae1b1..e1f116ecfc1 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1533,75 +1533,6 @@ gb_LinkTarget__use_harfbuzz := 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 @@ -2929,9 +2860,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 8071d88cb7b..ba3c2ef1a9d 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -102,7 +102,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@ @@ -442,8 +441,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@ @@ -573,7 +570,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 5d189fd0d0908f8f8da16073a5faa91838a6f114..5e5275bf6d8a77ab8dc625b7749ca8f429cccd14 100644 GIT binary patch delta 34 qcmZqKDf4`#OhXG}3sVbo3(FSP0@>;DKbSe&#Z+0hi>b2ZeFp&G`V0gB delta 1272 zcmcgsO=uHA7$wOj;!-Td*8bSmuNx^9yW7O3jiscJ{#r>B>9$ynHEgoeW^uZ+>}*MM zYK4F|+e;Zdi1g^8Qb80if*^SCCKBE-kcOnUu2EZ-v{9le21kJTa9?-I+?NYJ&BEx4T6*sFuYD zQhXsV!aCJf5!*=yn%PLVzkz+;78=>nA-`?C@SJCDUwlnVlbT&HOc(_xk4zEVD_F-c zDCo$tQBHG^4h6mlvg-!c4RaM%hz;S85(WOm{JpIl1F#>@Jj!S^5*i+f3=b6YMcJUT zW?2}?H9QU>S2bbTFy%EZN2nYQ$x#^_#H;`eMkCRok#J-H8`+#)v>a0JM!HNYO)~G= zIPMc!O7gadE^y2wyC3|)%kJOh{w8Yz(9%a>mt331kA&)eNB$ z@M4M^dbT=gYpcYZ#zhGp)P^=SkptU>AA<>@lWO94PP7E zdFpMb&DO_lp`Gpj654$njqSDiFR`EBgbM)|wXq;vZFTtrUAHV^I~3Gg@uBbywt3+1 z@GV~x+5Rgb$U=t!k;$I~anM~qK=YcCA6w?er|TNZZdKbe6AMd_Bc_8koKdDV2l|61 z>4(~84k19Wu0Rs;F&v9QNEuOXDs1`4+wPfQdyhRmY-`smZk`H8)ym3#K`3ap$>&^i zK*LU+tgq%zjCnOZdOy%2b?DyZ>^%$z!txf`EP z_N7zSW;JJA$4(F YUFb`nIvZvMh5JveF8@2LD^U3T7sU9O@c;k- diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk index 0580a8b4106..7e8b778fd57 100644 --- 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 44280e3250e..44c1c63bcf1 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/external/libxmlsec/ExternalProject_xmlsec.mk b/external/libxmlsec/ExternalProject_xmlsec.mk index 9259f014d5f..a85653f7bd7 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/oox/CppunitTest_oox_tokenmap.mk b/oox/CppunitTest_oox_tokenmap.mk index 9eac2a544bf..ef6d5c94c59 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 fcd7215c23a..a178883027d 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 20e827b6868..9b869f9a279 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 37f3c8f0af9..2167dd281b0 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 65b3cfc6582..8217bc16dd4 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 \ -- 2.30.2