diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-12-08 09:29:28 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2014-12-08 09:07:27 +0000 |
| commit | bf6544c0ab0625e5ce5918f6d861763d4fa87aba (patch) | |
| tree | 36ab0c865a41eee381cf165c7bff0b2d09136375 /RepositoryExternal.mk | |
| parent | 4517c94000153eab6c034ea548698953dd93f794 (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 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index c8f093e9a5ef..b32b06ddc519 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -279,17 +279,6 @@ endef endif # SYSTEM_GLEW -define gb_LinkTarget__use_clew -$(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,clcc)/src \ - $$(INCLUDE) \ -) -$(call gb_LinkTarget_use_libraries,$(1),\ - clew \ -) - -endef - define gb_LinkTarget__use_iconv $(call gb_LinkTarget_add_libs,$(1),-liconv) |