summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-12-08 09:29:28 +0200
committerDavid Tardon <dtardon@redhat.com>2014-12-08 09:07:27 +0000
commitbf6544c0ab0625e5ce5918f6d861763d4fa87aba (patch)
tree36ab0c865a41eee381cf165c7bff0b2d09136375 /external
parent4517c94000153eab6c034ea548698953dd93f794 (diff)
Don't treat clew as part of an "external" clcc module
There is no obvious authoritative upstream for clew anyway, so it causes philosophical problems for distros. For a while, we used to use a zip archive from the "clcc" project on SourceForge that included clew.c and clew.h. (Before that we also just had clew.c and clew.h in our source repo.) So, drop the external/clcc module and have clew.c and clew.h in the source repo again. But this time clew is in a module of its own, not in sc. This re-introduces "No need to have OpenCL optional at configure-time" This reverts commit 764836cb00e8e6dfd2ab48e080a166ec90359e01. Change-Id: I413142f4f9f8399489f9c3e5327132822f07a454 Reviewed-on: https://gerrit.libreoffice.org/13368 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'external')
-rw-r--r--external/Module_external.mk1
-rw-r--r--external/clcc/Library_clew.mk35
-rw-r--r--external/clcc/Makefile7
-rw-r--r--external/clcc/Module_clcc.mk17
-rw-r--r--external/clcc/UnpackedTarball_clcc.mk25
-rw-r--r--external/clcc/clew-non-static.patch52
6 files changed, 0 insertions, 137 deletions
diff --git a/external/Module_external.mk b/external/Module_external.mk
index e7c99d16351e..6d38fd583939 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -27,7 +27,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,BSH,beanshell) \
$(call gb_Helper_optional,CAIRO,cairo) \
$(call gb_Helper_optional,CDR,libcdr) \
- $(call gb_Helper_optional,CLCC,clcc) \
$(call gb_Helper_optional,CLUCENE,clucene) \
$(call gb_Helper_optional,CMIS,libcmis) \
$(call gb_Helper_optional,COINMP,coinmp) \
diff --git a/external/clcc/Library_clew.mk b/external/clcc/Library_clew.mk
deleted file mode 100644
index 8841ab9cf30f..000000000000
--- a/external/clcc/Library_clew.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Library_Library,clew))
-
-$(eval $(call gb_Library_use_unpacked,clew,clcc))
-
-$(eval $(call gb_Library_add_defs,clew,\
- -DCLEW_BUILD \
-))
-
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_libs,clew,\
- -ldl \
- -lrt \
-))
-endif
-
-ifeq ($(OS),MACOSX)
-$(eval $(call gb_Library_add_libs,clew,\
- -framework OpenCL \
-))
-endif
-
-$(eval $(call gb_Library_add_generated_cobjects,clew,\
- UnpackedTarball/clcc/src/clew \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/clcc/Makefile b/external/clcc/Makefile
deleted file mode 100644
index e4968cf85fb6..000000000000
--- a/external/clcc/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-
-module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
-
-include $(module_directory)/../../solenv/gbuild/partial_build.mk
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/clcc/Module_clcc.mk b/external/clcc/Module_clcc.mk
deleted file mode 100644
index 245617fd21ac..000000000000
--- a/external/clcc/Module_clcc.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Module_Module,clcc))
-
-$(eval $(call gb_Module_add_targets,clcc,\
- Library_clew \
- UnpackedTarball_clcc \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/clcc/UnpackedTarball_clcc.mk b/external/clcc/UnpackedTarball_clcc.mk
deleted file mode 100644
index 011d0a52af4b..000000000000
--- a/external/clcc/UnpackedTarball_clcc.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,clcc))
-
-$(eval $(call gb_UnpackedTarball_set_tarball,clcc,$(CLCC_TARBALL),0))
-
-$(eval $(call gb_UnpackedTarball_set_patchlevel,clcc,0))
-
-$(eval $(call gb_UnpackedTarball_fix_end_of_line,clcc,\
- src/clew.c \
- src/clew.h \
-))
-
-$(eval $(call gb_UnpackedTarball_add_patches,clcc,\
- external/clcc/clew-non-static.patch \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/clcc/clew-non-static.patch b/external/clcc/clew-non-static.patch
deleted file mode 100644
index f111930f3928..000000000000
--- a/external/clcc/clew-non-static.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- src/clew.h
-+++ src/clew.h
-@@ -1141,25 +1141,28 @@
- // calling the returned function address.
- //
- typedef CL_API_ENTRY void * (CL_API_CALL * PFNCLGETEXTENSIONFUNCTIONADDRESS)(const char * /* func_name */) CL_API_SUFFIX__VERSION_1_0;
--
--
--#define CLEW_STATIC
-
- #ifdef CLEW_STATIC
- # define CLEWAPI extern
- #else
- # ifdef CLEW_BUILD
--# define CLEWAPI extern __declspec(dllexport)
-+# if defined(_WIN32)
-+# define CLEWAPI extern __declspec(dllexport)
-+# elif defined(HAVE_GCC_VISIBILITY_FEATURE)
-+# define CLEWAPI extern __attribute__ ((visibility("default")))
-+# else
-+# define CLEWAPI extern
-+# endif
- # else
--# define CLEWAPI extern __declspec(dllimport)
-+# if defined(_WIN32)
-+# define CLEWAPI extern __declspec(dllimport)
-+# else
-+# define CLEWAPI extern
-+# endif
- # endif
- #endif
-
--#if defined(_WIN32)
--#define CLEW_FUN_EXPORT extern
--#else
- #define CLEW_FUN_EXPORT CLEWAPI
--#endif
-
- #define CLEW_GET_FUN(x) x
-
-@@ -1305,9 +1305,9 @@
- #define CLEW_ERROR_IMPORT_FAILED -3 //!< Error code for failing to import a named function from the dll
-
- //! \brief Load OpenCL dynamic library and set function entry points
--int clewInit (const char*);
-+CLEW_FUN_EXPORT int clewInit (const char*);
- //! \brief Convert an OpenCL error code to its string equivalent
--const char* clewErrorString (cl_int error);
-+CLEW_FUN_EXPORT const char* clewErrorString (cl_int error);
-
- #ifdef __cplusplus
- }