From c47e4a44bde232a42c24a1b41402d4048cd90fea Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Tue, 29 Sep 2020 10:30:27 -0400
Subject: [PATCH] Fix hunspell linkage on linux
---
indra/cmake/Copy3rdPartyLibs.cmake | 1 -
indra/cmake/Hunspell.cmake | 2 +-
indra/newview/viewer_manifest.py | 2 --
3 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 4ae13fe83bc..a488dfd179a 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -176,7 +176,6 @@ elseif(LINUX)
libaprutil-1.so.0
${EXPAT_COPY}
libGLOD.so
- libhunspell-1.3.so.0.0.0
libopenal.so
libuuid.so.16
libuuid.so.16.0.22
diff --git a/indra/cmake/Hunspell.cmake b/indra/cmake/Hunspell.cmake
index 06227b3fe23..7e4bd179585 100644
--- a/indra/cmake/Hunspell.cmake
+++ b/indra/cmake/Hunspell.cmake
@@ -13,7 +13,7 @@ else (USESYSTEMLIBS)
elseif(DARWIN)
set(HUNSPELL_LIBRARY hunspell-1.3)
elseif(LINUX)
- set(HUNSPELL_LIBRARY hunspell-1.3)
+ set(HUNSPELL_LIBRARY hunspell-1.7)
else()
message(FATAL_ERROR "Invalid platform")
endif()
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index d8ae2cd367d..dbe44fe9360 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -1467,7 +1467,6 @@ def construct(self):
self.path("libuuid.so*")
self.path("libSDL2*.so*")
self.path("libopenjpeg.so*")
- self.path("libhunspell-1.3.so*")
self.path("libepoxy.so")
self.path("libepoxy.so.0")
self.path("libepoxy.so.0.0.0")
@@ -1544,7 +1543,6 @@ def construct(self):
self.path("libuuid.so*")
self.path("libSDL2*.so*")
self.path("libopenjpeg.so*")
- self.path("libhunspell-1.3.so*")
self.path("libepoxy.so")
self.path("libepoxy.so.0")
self.path("libepoxy.so.0.0.0")
--
GitLab