diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2013-11-03 20:19:22 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-11-04 02:29:08 -0600 |
| commit | fde2065b0f3266fc7ee9e1b85733e3ddcf1c9e03 (patch) | |
| tree | 6755c82c8ed9e337e64dfb6b8df2ab434aae7193 | |
| parent | 8339d33a24e9810ae23544f0f4d1a52bd732c49f (diff) | |
fdo#70393: move openssl to a subdir of external
Change-Id: I10bf92b18ee5ad56f1b4fbee3e4008b35b822be4
Reviewed-on: https://gerrit.libreoffice.org/6547
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
| -rw-r--r-- | RepositoryModule_host.mk | 1 | ||||
| -rw-r--r-- | external/Module_external.mk | 1 | ||||
| -rw-r--r-- | external/openssl/ExternalPackage_openssl.mk (renamed from openssl/ExternalPackage_openssl.mk) | 0 | ||||
| -rw-r--r-- | external/openssl/ExternalProject_openssl.mk (renamed from openssl/ExternalProject_openssl.mk) | 0 | ||||
| -rw-r--r-- | external/openssl/Makefile (renamed from openssl/Makefile) | 2 | ||||
| -rw-r--r-- | external/openssl/Module_openssl.mk (renamed from openssl/Module_openssl.mk) | 0 | ||||
| -rw-r--r-- | external/openssl/README (renamed from openssl/README) | 0 | ||||
| -rw-r--r-- | external/openssl/UnpackedTarball_openssl.mk (renamed from openssl/UnpackedTarball_openssl.mk) | 10 | ||||
| -rw-r--r-- | external/openssl/opensslios.patch (renamed from openssl/opensslios.patch) | 0 | ||||
| -rw-r--r-- | external/openssl/openssllnx.patch (renamed from openssl/openssllnx.patch) | 0 | ||||
| -rw-r--r-- | external/openssl/opensslmingw.patch (renamed from openssl/opensslmingw.patch) | 0 | ||||
| -rw-r--r-- | external/openssl/opensslsol.patch (renamed from openssl/opensslsol.patch) | 0 | ||||
| -rw-r--r-- | external/openssl/opensslwnt.patch (renamed from openssl/opensslwnt.patch) | 0 |
13 files changed, 7 insertions, 7 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index a5500abfe152..7ed7dff825c1 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -83,7 +83,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ officecfg \ oovbaapi \ oox \ - $(call gb_Helper_optional,OPENSSL,openssl) \ package \ padmin \ $(call gb_Helper_optional,POPPLER,poppler) \ diff --git a/external/Module_external.mk b/external/Module_external.mk index 23ca67de94d9..63e3bf364299 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -66,6 +66,7 @@ $(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,VISIO,libvisio) \ $(call gb_Helper_optional,WPD,libwpd) \ diff --git a/openssl/ExternalPackage_openssl.mk b/external/openssl/ExternalPackage_openssl.mk index 695c7b7119b6..695c7b7119b6 100644 --- a/openssl/ExternalPackage_openssl.mk +++ b/external/openssl/ExternalPackage_openssl.mk diff --git a/openssl/ExternalProject_openssl.mk b/external/openssl/ExternalProject_openssl.mk index e41adb868e5a..e41adb868e5a 100644 --- a/openssl/ExternalProject_openssl.mk +++ b/external/openssl/ExternalProject_openssl.mk diff --git a/openssl/Makefile b/external/openssl/Makefile index ccb1c85a04da..e4968cf85fb6 100644 --- a/openssl/Makefile +++ b/external/openssl/Makefile @@ -2,6 +2,6 @@ module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) -include $(module_directory)/../solenv/gbuild/partial_build.mk +include $(module_directory)/../../solenv/gbuild/partial_build.mk # vim: set noet sw=4 ts=4: diff --git a/openssl/Module_openssl.mk b/external/openssl/Module_openssl.mk index 698aa071021f..698aa071021f 100644 --- a/openssl/Module_openssl.mk +++ b/external/openssl/Module_openssl.mk diff --git a/openssl/README b/external/openssl/README index 399bdd56fded..399bdd56fded 100644 --- a/openssl/README +++ b/external/openssl/README diff --git a/openssl/UnpackedTarball_openssl.mk b/external/openssl/UnpackedTarball_openssl.mk index e7fdfce57817..cec09d28f5e9 100644 --- a/openssl/UnpackedTarball_openssl.mk +++ b/external/openssl/UnpackedTarball_openssl.mk @@ -91,11 +91,11 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,openssl,\ )) $(eval $(call gb_UnpackedTarball_add_patches,openssl,\ - $(if $(filter LINUX FREEBSD ANDROID,$(OS)),openssl/openssllnx.patch) \ - $(if $(filter WNTGCC,$(OS)$(COM)),openssl/opensslmingw.patch) \ - $(if $(filter MSC,$(COM)),openssl/opensslwnt.patch) \ - $(if $(filter SOLARIS,$(OS)),openssl/opensslsol.patch) \ - $(if $(filter IOS,$(OS)),openssl/opensslios.patch) \ + $(if $(filter LINUX FREEBSD ANDROID,$(OS)),external/openssl/openssllnx.patch) \ + $(if $(filter WNTGCC,$(OS)$(COM)),external/openssl/opensslmingw.patch) \ + $(if $(filter MSC,$(COM)),external/openssl/opensslwnt.patch) \ + $(if $(filter SOLARIS,$(OS)),external/openssl/opensslsol.patch) \ + $(if $(filter IOS,$(OS)),external/openssl/opensslios.patch) \ )) # vim: set noet sw=4 ts=4: diff --git a/openssl/opensslios.patch b/external/openssl/opensslios.patch index e3e1c218432f..e3e1c218432f 100644 --- a/openssl/opensslios.patch +++ b/external/openssl/opensslios.patch diff --git a/openssl/openssllnx.patch b/external/openssl/openssllnx.patch index 23a7d9e4c228..23a7d9e4c228 100644 --- a/openssl/openssllnx.patch +++ b/external/openssl/openssllnx.patch diff --git a/openssl/opensslmingw.patch b/external/openssl/opensslmingw.patch index e0dc96029d6b..e0dc96029d6b 100644 --- a/openssl/opensslmingw.patch +++ b/external/openssl/opensslmingw.patch diff --git a/openssl/opensslsol.patch b/external/openssl/opensslsol.patch index a22dc05cee39..a22dc05cee39 100644 --- a/openssl/opensslsol.patch +++ b/external/openssl/opensslsol.patch diff --git a/openssl/opensslwnt.patch b/external/openssl/opensslwnt.patch index b68e03715f2a..b68e03715f2a 100644 --- a/openssl/opensslwnt.patch +++ b/external/openssl/opensslwnt.patch |