[Libreoffice-commits] core.git: external/Module_external.mk external/openssl openssl/ExternalPackage_openssl.mk openssl/ExternalProject_openssl.mk openssl/Makefile openssl/Module_openssl.mk openssl/opensslios.patch openssl/openssllnx.patch openssl/opensslmingw.patch openssl/opensslsol.patch openssl/opensslwnt.patch openssl/README openssl/UnpackedTarball_openssl.mk RepositoryModule_host.mk

[Khaled Hosny]

 RepositoryModule_host.mk                    |    1 
 external/Module_external.mk                 |    1 
 external/openssl/ExternalPackage_openssl.mk |   21 +++
 external/openssl/ExternalProject_openssl.mk |   93 ++++++++++++++++
 external/openssl/Makefile                   |    7 +
 external/openssl/Module_openssl.mk          |   20 +++
 external/openssl/README                     |    7 +
 external/openssl/UnpackedTarball_openssl.mk |  101 ++++++++++++++++++
 external/openssl/opensslios.patch           |   12 ++
 external/openssl/openssllnx.patch           |   23 ++++
 external/openssl/opensslmingw.patch         |  109 +++++++++++++++++++
 external/openssl/opensslsol.patch           |   81 ++++++++++++++
 external/openssl/opensslwnt.patch           |  154 ++++++++++++++++++++++++++++
 openssl/ExternalPackage_openssl.mk          |   21 ---
 openssl/ExternalProject_openssl.mk          |   93 ----------------
 openssl/Makefile                            |    7 -
 openssl/Module_openssl.mk                   |   20 ---
 openssl/README                              |    7 -
 openssl/UnpackedTarball_openssl.mk          |  101 ------------------
 openssl/opensslios.patch                    |   12 --
 openssl/openssllnx.patch                    |   23 ----
 openssl/opensslmingw.patch                  |  109 -------------------
 openssl/opensslsol.patch                    |   81 --------------
 openssl/opensslwnt.patch                    |  154 ----------------------------
 24 files changed, 629 insertions(+), 629 deletions(-)

New commits:
commit fde2065b0f3266fc7ee9e1b85733e3ddcf1c9e03
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Sun Nov 3 20:19:22 2013 +0200

    fdo#70393: move openssl to a subdir of external
    
    Change-Id: I10bf92b18ee5ad56f1b4fbee3e4008b35b822be4
    Reviewed-on: https://gerrit.libreoffice.org/6547
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index a5500ab..7ed7dff 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 23ca67d..63e3bf3 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
similarity index 100%
rename from openssl/ExternalPackage_openssl.mk
rename to external/openssl/ExternalPackage_openssl.mk
diff --git a/openssl/ExternalProject_openssl.mk b/external/openssl/ExternalProject_openssl.mk
similarity index 100%
rename from openssl/ExternalProject_openssl.mk
rename to external/openssl/ExternalProject_openssl.mk
diff --git a/openssl/Makefile b/external/openssl/Makefile
similarity index 71%
rename from openssl/Makefile
rename to external/openssl/Makefile
index ccb1c85..e4968cf 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
similarity index 100%
rename from openssl/Module_openssl.mk
rename to external/openssl/Module_openssl.mk
diff --git a/openssl/README b/external/openssl/README
similarity index 100%
rename from openssl/README
rename to external/openssl/README
diff --git a/openssl/UnpackedTarball_openssl.mk b/external/openssl/UnpackedTarball_openssl.mk
similarity index 88%
rename from openssl/UnpackedTarball_openssl.mk
rename to external/openssl/UnpackedTarball_openssl.mk
index e7fdfce..cec09d2 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
similarity index 100%
rename from openssl/opensslios.patch
rename to external/openssl/opensslios.patch
diff --git a/openssl/openssllnx.patch b/external/openssl/openssllnx.patch
similarity index 100%
rename from openssl/openssllnx.patch
rename to external/openssl/openssllnx.patch
diff --git a/openssl/opensslmingw.patch b/external/openssl/opensslmingw.patch
similarity index 100%
rename from openssl/opensslmingw.patch
rename to external/openssl/opensslmingw.patch
diff --git a/openssl/opensslsol.patch b/external/openssl/opensslsol.patch
similarity index 100%
rename from openssl/opensslsol.patch
rename to external/openssl/opensslsol.patch
diff --git a/openssl/opensslwnt.patch b/external/openssl/opensslwnt.patch
similarity index 100%
rename from openssl/opensslwnt.patch
rename to external/openssl/opensslwnt.patch