projects / libreoffice.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1f03ebc)
no-openssl
authorDebian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Sun, 26 Mar 2017 15:06:24 +0000 (15:06 +0000)
committerPeter Michael Green <plugwash@raspbian.org>
Sun, 26 Mar 2017 15:06:24 +0000 (15:06 +0000)
don't add -lssl etc if not needed (because we use system-postgresql)

Gbp-Pq: Name no-openssl.diff

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/Library_ucpdav1.mk patch | blob | history
xmlsecurity/Library_xsec_xmlsec.mk patch | blob | history

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 1932edae1b1564752bcca9191d7b8ffa6a0ee14f..e1f116ecfc1a0956cb97b636576b02a55017b0c6 100644 (file)
--- 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 8071d88cb7b36d1c3bb3b60220eba4669ee66f8a..ba3c2ef1a9d21d7b42d349f040578d3d5b5d3172 100644 (file)
--- 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 (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 44280e3250eae27c59edba2f0b5cb01b2df3e3d0..44c1c63bcf13e96b716128ad53b327b612a2cbd5 100644 (file)
--- 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 9259f014d5fa53d1af522f99162e584407bfec5b..a85653f7bd70042bc7134a9147e7feab96907b02 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 9eac2a544bff3f7f1b0f391d2c962e7b543eafef..ef6d5c94c5920dbf41593b7e0d797688cb11e69d 100644 (file)
--- 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 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 20e827b6868a708ce0e8666e06032d6deff74e81..9b869f9a279771a52fc160b1e1cacee1cb3adead 100644 (file)
--- 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 37f3c8f0af9c5ccb81c173b50e1039ed6a973ae0..2167dd281b0c602d4e9ed8eed62d1e5b8ae6ae11 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,\
@@ -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 65b3cfc6582c2b50e840f8791f55e5e8c086b310..8217bc16dd4c53752821ea587d91c265a2aea249 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.