RepositoryModule_host.mk | 1 clew/Library_clew.mk | 36 ---- clew/Makefile | 7 clew/Module_clew.mk | 16 -- clew/source/clew.c | 325 ------------------------------------------ external/Module_external.mk | 1 external/clew/Library_clew.mk | 36 ++++ external/clew/Makefile | 7 external/clew/Module_clew.mk | 16 ++ external/clew/README | 5 external/clew/source/clew.c | 325 ++++++++++++++++++++++++++++++++++++++++++ 11 files changed, 390 insertions(+), 385 deletions(-)
New commits: commit 38cd1d9a5f00dc69ba0d60e2fe6957090c7a26d1 Author: Michael Stahl <mst...@redhat.com> Date: Wed Mar 9 13:59:35 2016 +0100 clew: move this foreign code to external/clew ... so that hopefully it won't be "cleaned up" and needlessly diverge from any hypothetical future upstream. Change-Id: I10503072f618ac6b74bc52d4d59c0d8951bd8d0d Reviewed-on: https://gerrit.libreoffice.org/23075 Reviewed-by: David Ostrovsky <da...@ostrovsky.org> Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Michael Stahl <mst...@redhat.com> diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 4b654a2..d2f1d84 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -34,7 +34,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ bridges \ canvas \ chart2 \ - $(call gb_Helper_optional,OPENCL,clew) \ cli_ure \ $(call gb_Helper_optional,DESKTOP,codemaker) \ comphelper \ diff --git a/external/Module_external.mk b/external/Module_external.mk index 2512b85..44280e3 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -29,6 +29,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,BZIP2,bzip2) \ $(call gb_Helper_optional,CAIRO,cairo) \ $(call gb_Helper_optional,CDR,libcdr) \ + $(call gb_Helper_optional,OPENCL,clew) \ $(call gb_Helper_optional,CLUCENE,clucene) \ $(call gb_Helper_optional,CMIS,libcmis) \ $(call gb_Helper_optional,COINMP,coinmp) \ diff --git a/clew/Library_clew.mk b/external/clew/Library_clew.mk similarity index 96% rename from clew/Library_clew.mk rename to external/clew/Library_clew.mk index 91f4bce..31ef971 100644 --- a/clew/Library_clew.mk +++ b/external/clew/Library_clew.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Library_add_libs,clew,\ endif $(eval $(call gb_Library_add_cobjects,clew,\ - clew/source/clew \ + external/clew/source/clew \ )) # This is required for module-deps.pl to produce correct dependencies. diff --git a/clew/Makefile b/external/clew/Makefile similarity index 71% rename from clew/Makefile rename to external/clew/Makefile index ccb1c85..e4968cf8 100644 --- a/clew/Makefile +++ b/external/clew/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/clew/Module_clew.mk b/external/clew/Module_clew.mk similarity index 100% rename from clew/Module_clew.mk rename to external/clew/Module_clew.mk diff --git a/external/clew/README b/external/clew/README new file mode 100644 index 0000000..7a0d652 --- /dev/null +++ b/external/clew/README @@ -0,0 +1,5 @@ +CLEW is the OpenCL Extension Wrangler - similar to GLEW but for OpenCL + +This project doesn't appear to have an obvious upstream, so +the source files are in our git repo and there is no option +to use a system library. diff --git a/clew/source/clew.c b/external/clew/source/clew.c similarity index 100% rename from clew/source/clew.c rename to external/clew/source/clew.c _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits