RepositoryModule_host.mk | 1
external/Module_external.mk | 1
external/postgresql/ExternalProject_postgresql.mk | 69 ++
external/postgresql/Makefile | 7
external/postgresql/Module_postgresql.mk | 21
external/postgresql/README | 3
external/postgresql/UnpackedTarball_postgresql.mk | 22
external/postgresql/postgresql-9.2.1-autoreconf.patch | 521 +++++++++++++++++
external/postgresql/postgresql-9.2.1-libreoffice.patch | 113 +++
external/postgresql/postgresql-libs-leak.patch | 40 +
postgresql/ExternalProject_postgresql.mk | 69 --
postgresql/Makefile | 7
postgresql/Module_postgresql.mk | 21
postgresql/README | 3
postgresql/UnpackedTarball_postgresql.mk | 22
postgresql/postgresql-9.2.1-autoreconf.patch | 521 -----------------
postgresql/postgresql-9.2.1-libreoffice.patch | 113 ---
postgresql/postgresql-libs-leak.patch | 40 -
18 files changed, 797 insertions(+), 797 deletions(-)
New commits:
commit 547d2c75824ab0e22fe33ff6d7d40fd5b313ff26
Author: Khaled Hosny <khaledho...@eglug.org>
Date: Sun Nov 3 20:22:44 2013 +0200
fdo#70393: move postgresql to a subdir of external
Change-Id: Ibd7c9a4db0150bdb115b061e21587ca964dc2c84
Reviewed-on: https://gerrit.libreoffice.org/6549
Reviewed-by: David Tardon <dtar...@redhat.com>
Tested-by: David Tardon <dtar...@redhat.com>
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index ced54de..253c52e 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -85,7 +85,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
oox \
package \
padmin \
- $(call gb_Helper_optional,POSTGRESQL,postgresql) \
postprocess \
psprint_config \
$(call gb_Helper_optional,PYTHON,python3) \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 481f46e..d7b041b 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,OPENSSL,openssl) \
$(call gb_Helper_optional,ORCUS,liborcus) \
$(call gb_Helper_optional,POPPLER,poppler) \
+ $(call gb_Helper_optional,POSTGRESQL,postgresql) \
$(call gb_Helper_optional,VISIO,libvisio) \
$(call gb_Helper_optional,WPD,libwpd) \
$(call gb_Helper_optional,WPG,libwpg) \
diff --git a/postgresql/ExternalProject_postgresql.mk
b/external/postgresql/ExternalProject_postgresql.mk
similarity index 100%
rename from postgresql/ExternalProject_postgresql.mk
rename to external/postgresql/ExternalProject_postgresql.mk
diff --git a/postgresql/Makefile b/external/postgresql/Makefile
similarity index 71%
rename from postgresql/Makefile
rename to external/postgresql/Makefile
index ccb1c85..e4968cf 100644
--- a/postgresql/Makefile
+++ b/external/postgresql/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/postgresql/Module_postgresql.mk
b/external/postgresql/Module_postgresql.mk
similarity index 100%
rename from postgresql/Module_postgresql.mk
rename to external/postgresql/Module_postgresql.mk
diff --git a/postgresql/README b/external/postgresql/README
similarity index 100%
rename from postgresql/README
rename to external/postgresql/README
diff --git a/postgresql/UnpackedTarball_postgresql.mk
b/external/postgresql/UnpackedTarball_postgresql.mk
similarity index 79%
rename from postgresql/UnpackedTarball_postgresql.mk
rename to external/postgresql/UnpackedTarball_postgresql.mk
index c7e1704..3d0fe6c 100644
--- a/postgresql/UnpackedTarball_postgresql.mk
+++ b/external/postgresql/UnpackedTarball_postgresql.mk
@@ -14,9 +14,9 @@ $(eval $(call
gb_UnpackedTarball_set_tarball,postgresql,$(POSTGRESQL_TARBALL),,p
$(eval $(call gb_UnpackedTarball_set_patchlevel,postgresql,3))
$(eval $(call gb_UnpackedTarball_add_patches,postgresql, \
- postgresql/postgresql-libs-leak.patch \
- postgresql/postgresql-9.2.1-autoreconf.patch \
- postgresql/postgresql-9.2.1-libreoffice.patch \
+ external/postgresql/postgresql-libs-leak.patch \
+ external/postgresql/postgresql-9.2.1-autoreconf.patch \
+ external/postgresql/postgresql-9.2.1-libreoffice.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/postgresql/postgresql-9.2.1-autoreconf.patch
b/external/postgresql/postgresql-9.2.1-autoreconf.patch
similarity index 100%
rename from postgresql/postgresql-9.2.1-autoreconf.patch
rename to external/postgresql/postgresql-9.2.1-autoreconf.patch
diff --git a/postgresql/postgresql-9.2.1-libreoffice.patch
b/external/postgresql/postgresql-9.2.1-libreoffice.patch
similarity index 100%
rename from postgresql/postgresql-9.2.1-libreoffice.patch
rename to external/postgresql/postgresql-9.2.1-libreoffice.patch
diff --git a/postgresql/postgresql-libs-leak.patch
b/external/postgresql/postgresql-libs-leak.patch
similarity index 100%
rename from postgresql/postgresql-libs-leak.patch
rename to external/postgresql/postgresql-libs-leak.patch
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
