From ba841b7887b07f638b35c6950053fed104fa7051 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Tue, 10 Nov 2020 16:35:32 -0500
Subject: [PATCH] Use system expat on macos to avoid symbol and dylib conflicts
with system Frameworks
---
autobuild.xml | 72 ++++++++++++++--------------
indra/cmake/Copy3rdPartyLibs.cmake | 2 +
indra/cmake/EXPAT.cmake | 12 ++---
indra/llcommon/llsdserialize_xml.cpp | 2 +-
indra/llui/llxuiparser.cpp | 6 +--
indra/llxml/llxmlnode.h | 6 +--
indra/llxml/llxmlparser.h | 6 +--
indra/newview/llvoicevivox.cpp | 4 +-
indra/newview/llvoicevivox.h | 4 +-
indra/newview/viewer_manifest.py | 6 +--
10 files changed, 59 insertions(+), 61 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index f41399efd4a..bad1e2a97e2 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -54,9 +54,11 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>9b8bcc3be6dbe40a04c9c81c313f70dc</string>
+ <string>045acdfadb2d3890f95182ad78bcc5c37d46fb2065982f5e10f69bf8e9319bcb747e8b0bc11268e8065123abe3ebd561</string>
+ <key>hash_algorithm</key>
+ <string>sha3_384</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/68333/658209/apr_suite-1.4.5.548882-darwin64-548882.tar.bz2</string>
+ <string>https://git.alchemyviewer.org/api/v4/projects/111/packages/generic/apr_suite-668/1.7.0/apr_suite-1.7.0-darwin64-668.tar.xz</string>
</map>
<key>name</key>
<string>darwin64</string>
@@ -66,9 +68,11 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>84a1a140f20b25d714949185e854d14b</string>
+ <string>7fdeae0b56042a597fb135c677dbf2952dda101a6e8dff326560672cc8637c8ea4bbf19feaefa73b2384ca12d14f6c1b</string>
+ <key>hash_algorithm</key>
+ <string>sha3_384</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/4811/15302/apr_suite-1.4.5.504800-linux64-504800.tar.bz2</string>
+ <string>https://git.alchemyviewer.org/api/v4/projects/111/packages/generic/apr_suite-668/1.7.0/apr_suite-1.7.0-linux64-668.tar.xz</string>
</map>
<key>name</key>
<string>linux64</string>
@@ -103,7 +107,7 @@
</map>
</map>
<key>version</key>
- <string>1.4.5.328</string>
+ <string>1.7.0</string>
</map>
<key>boost</key>
<map>
@@ -507,26 +511,16 @@
<string>expat</string>
<key>platforms</key>
<map>
- <key>darwin64</key>
- <map>
- <key>archive</key>
- <map>
- <key>hash</key>
- <string>3656b7f7b655cb267fd94f089d2e145c</string>
- <key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/54860/510198/expat-2.1.1.538990-darwin64-538990.tar.bz2</string>
- </map>
- <key>name</key>
- <string>darwin64</string>
- </map>
<key>linux64</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
- <string>5e1f025d1cebd12db542080aa755257f</string>
+ <string>29fa7170d908e84c6b456064ad51f1f9feba11effd12d7c0f9600597fb51085ec4d72eee8473420167568018b3c53282</string>
+ <key>hash_algorithm</key>
+ <string>sha3_384</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/380/943/expat-2.1.1.500375-linux64-500375.tar.bz2</string>
+ <string>https://git.alchemyviewer.org/api/v4/projects/109/packages/generic/expat-658/2.2.10/expat-2.2.10-linux64-658.tar.xz</string>
</map>
<key>name</key>
<string>linux64</string>
@@ -536,11 +530,11 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>4f6ce988932eb420afdb4eacd75dbce8</string>
+ <string>af1d89aa93916ee8ef9382f057b47abf31ebc6e44f1f9ecd8bc16193ef40a98669a821c2c0dd3c9368c14630a5144119</string>
<key>hash_algorithm</key>
- <string>md5</string>
+ <string>sha3_384</string>
<key>url</key>
- <string>https://pkg.alchemyviewer.org/repository/autobuild-external/expat/windows/expat-2.2.9.323-windows-323.tar.bz2</string>
+ <string>https://git.alchemyviewer.org/api/v4/projects/109/packages/generic/expat-658/2.2.10/expat-2.2.10-windows-658.tar.xz</string>
</map>
<key>name</key>
<string>windows</string>
@@ -550,18 +544,18 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>49dc81485705a32d345b4af6dab4ac1c</string>
+ <string>b8f16fdb8a3034a0c9ea616bb2ab4950ba88b2e597e92d4d346305ac6fbf4b9b8ff2b44db9696cd499641b80cf6cce28</string>
<key>hash_algorithm</key>
- <string>md5</string>
+ <string>sha3_384</string>
<key>url</key>
- <string>https://pkg.alchemyviewer.org/repository/autobuild-external/expat/windows64/expat-2.2.9.323-windows64-323.tar.bz2</string>
+ <string>https://git.alchemyviewer.org/api/v4/projects/109/packages/generic/expat-658/2.2.10/expat-2.2.10-windows64-658.tar.xz</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
- <string>2.2.9.323</string>
+ <string>2.2.10</string>
</map>
<key>fmodstudio</key>
<map>
@@ -2618,9 +2612,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
- <string>99ea1808ee9f5b55029daa9fdef86776</string>
+ <string>8363cf19c3218df7454f06227e32443f3fdbfc4cca945bec7987d4b0e42ef3e59df879d0d9387dc5675d56e5976f6e05</string>
+ <key>hash_algorithm</key>
+ <string>sha3_384</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/55063/512104/xmlrpc_epi-0.54.1.539072-darwin64-539072.tar.bz2</string>
+ <string>https://git.alchemyviewer.org/api/v4/projects/110/packages/generic/xmlrpc-epi-669/0.54.1/xmlrpc_epi-0.54.1-darwin64-669.tar.xz</string>
</map>
<key>name</key>
<string>darwin64</string>
@@ -2630,9 +2626,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
- <string>35df17c3eb673030dea4bde9191aa506</string>
+ <string>048906c305677f634b2fa05191ee312c201fe1030d050abdb3c161ca82e11c291bdc10969b99d8bb8286531eb49c48a7</string>
+ <key>hash_algorithm</key>
+ <string>sha3_384</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/727/1489/xmlrpc_epi-0.54.1.500719-linux64-500719.tar.bz2</string>
+ <string>https://git.alchemyviewer.org/api/v4/projects/110/packages/generic/xmlrpc-epi-669/0.54.1/xmlrpc_epi-0.54.1-linux64-669.tar.xz</string>
</map>
<key>name</key>
<string>linux64</string>
@@ -2642,11 +2640,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
- <string>eb26c5779a2bf53f2038a89282bed227</string>
+ <string>f1878aaff7046b5a44eb992bb9c1d3334b404f4a4cc2c3e04b16a91e00370c7c12676063bfed8e2f2445763f11da5400</string>
<key>hash_algorithm</key>
- <string>md5</string>
+ <string>sha3_384</string>
<key>url</key>
- <string>https://pkg.alchemyviewer.org/repository/autobuild-external/xmlrpc-epi/windows/xmlrpc_epi-0.54.1.326-windows-326.tar.bz2</string>
+ <string>https://git.alchemyviewer.org/api/v4/projects/110/packages/generic/xmlrpc-epi-669/0.54.1/xmlrpc_epi-0.54.1-windows-669.tar.xz</string>
</map>
<key>name</key>
<string>windows</string>
@@ -2656,18 +2654,18 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
- <string>e33a10439dbd430e158bdca16da2adc4</string>
+ <string>927932400fbede3bbaf7f8ba2ddfd46f1ea89029efeff595fc481a1a4fd9ee715f6653c6ae69719259b6b8d9ce50d925</string>
<key>hash_algorithm</key>
- <string>md5</string>
+ <string>sha3_384</string>
<key>url</key>
- <string>https://pkg.alchemyviewer.org/repository/autobuild-external/xmlrpc-epi/windows64/xmlrpc_epi-0.54.1.326-windows64-326.tar.bz2</string>
+ <string>https://git.alchemyviewer.org/api/v4/projects/110/packages/generic/xmlrpc-epi-669/0.54.1/xmlrpc_epi-0.54.1-windows64-669.tar.xz</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
- <string>0.54.1.326</string>
+ <string>0.54.1</string>
</map>
<key>zlib</key>
<map>
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 27397511b68..8b7ac2f71b2 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -145,6 +145,8 @@ elseif(DARWIN)
liburiparser.dylib
liburiparser.1.dylib
liburiparser.1.0.27.dylib
+ libxmlrpc-epi.dylib
+ libxmlrpc-epi.0.dylib
)
if (USE_FMODSTUDIO)
diff --git a/indra/cmake/EXPAT.cmake b/indra/cmake/EXPAT.cmake
index 9e1242b5998..844cefd7413 100644
--- a/indra/cmake/EXPAT.cmake
+++ b/indra/cmake/EXPAT.cmake
@@ -6,6 +6,8 @@ set(EXPAT_FIND_REQUIRED ON)
if (USESYSTEMLIBS)
include(FindEXPAT)
+elseif(DARWIN)
+ find_package(EXPAT REQUIRED)
else (USESYSTEMLIBS)
use_prebuilt_binary(expat)
if (WINDOWS)
@@ -13,13 +15,9 @@ else (USESYSTEMLIBS)
debug libexpatd.lib
optimized libexpat.lib)
set(EXPAT_COPY libexpat.dll)
- else (WINDOWS)
+ else ()
set(EXPAT_LIBRARIES expat)
- if (DARWIN)
- set(EXPAT_COPY libexpat.1.dylib libexpat.dylib)
- else ()
- set(EXPAT_COPY libexpat.so.1 libexpat.so)
- endif ()
- endif (WINDOWS)
+ set(EXPAT_COPY libexpat.so.1 libexpat.so)
+ endif ()
set(EXPAT_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
endif (USESYSTEMLIBS)
diff --git a/indra/llcommon/llsdserialize_xml.cpp b/indra/llcommon/llsdserialize_xml.cpp
index d7dab88e33c..e61a6000e22 100644
--- a/indra/llcommon/llsdserialize_xml.cpp
+++ b/indra/llcommon/llsdserialize_xml.cpp
@@ -35,7 +35,7 @@
extern "C"
{
-#ifdef LL_USESYSTEMLIBS
+#if LL_DARWIN || defined(LL_USESYSTEMLIBS)
# include <expat.h>
#else
# include "expat/expat.h"
diff --git a/indra/llui/llxuiparser.cpp b/indra/llui/llxuiparser.cpp
index e7e824f0d72..9803789a1e8 100644
--- a/indra/llui/llxuiparser.cpp
+++ b/indra/llui/llxuiparser.cpp
@@ -30,10 +30,10 @@
#include "llxmlnode.h"
#include "llfasttimer.h"
-#ifdef LL_USESYSTEMLIBS
-#include <expat.h>
+#if LL_DARWIN || defined(LL_USESYSTEMLIBS)
+# include <expat.h>
#else
-#include "expat/expat.h"
+# include "expat/expat.h"
#endif
#include <fstream>
diff --git a/indra/llxml/llxmlnode.h b/indra/llxml/llxmlnode.h
index 574dd77b57f..b6c5845cb01 100644
--- a/indra/llxml/llxmlnode.h
+++ b/indra/llxml/llxmlnode.h
@@ -27,10 +27,10 @@
#ifndef LL_LLXMLNODE_H
#define LL_LLXMLNODE_H
-#ifdef LL_USESYSTEMLIBS
-#include <expat.h>
+#if LL_DARWIN || defined(LL_USESYSTEMLIBS)
+# include <expat.h>
#else
-#include "expat/expat.h"
+# include "expat/expat.h"
#endif
#include <map>
diff --git a/indra/llxml/llxmlparser.h b/indra/llxml/llxmlparser.h
index 54c4a838f38..73de6acb21a 100644
--- a/indra/llxml/llxmlparser.h
+++ b/indra/llxml/llxmlparser.h
@@ -27,10 +27,10 @@
#ifndef LL_LLXMLPARSER_H
#define LL_LLXMLPARSER_H
-#ifdef LL_USESYSTEMLIBS
-#include <expat.h>
+#if LL_DARWIN || defined(LL_USESYSTEMLIBS)
+# include <expat.h>
#else
-#include "expat/expat.h"
+# include "expat/expat.h"
#endif
class LLXmlParser
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index b7eae9b3b67..1631d90e392 100644
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -36,8 +36,8 @@
#include "llbufferstream.h"
#include "llfile.h"
#include "llmenugl.h"
-#ifdef LL_USESYSTEMLIBS
-# include "expat.h"
+#if LL_DARWIN || defined(LL_USESYSTEMLIBS)
+# include <expat.h>
#else
# include "expat/expat.h"
#endif
diff --git a/indra/newview/llvoicevivox.h b/indra/newview/llvoicevivox.h
index 09fc3c5171d..8d83c3d3fdd 100644
--- a/indra/newview/llvoicevivox.h
+++ b/indra/newview/llvoicevivox.h
@@ -41,8 +41,8 @@ class LLVivoxProtocolParser;
#include "llcoros.h"
#include <queue>
-#ifdef LL_USESYSTEMLIBS
-# include "expat.h"
+#if LL_DARWIN || defined(LL_USESYSTEMLIBS)
+# include <expat.h>
#else
# include "expat/expat.h"
#endif
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 1154245ad36..457fa0dfbe2 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -925,6 +925,8 @@ def construct(self):
CEF_framework = self.dst_path_of(CEF_framework)
for libfile in (
+ 'libapr-1.*.dylib',
+ 'libaprutil-1.*.dylib',
'libjpeg.*.dylib',
'libepoxy.*.dylib',
'libGLOD.dylib',
@@ -937,6 +939,7 @@ def construct(self):
'libvorbisenc.*.dylib',
'libvorbisfile.*.dylib',
'libwebp.*.dylib',
+ 'libxmlrpc-epi.*.dylib',
):
self.path(libfile)
@@ -1053,9 +1056,6 @@ def construct(self):
libfile_parent = self.get_dst_prefix()
dylibs=[]
for libfile in (
- "libapr-1.0.dylib",
- "libaprutil-1.0.dylib",
- "libexpat.1.dylib",
# libnghttp2.dylib is a symlink to
# libnghttp2.major.dylib, which is a symlink to
# libnghttp2.version.dylib. Get all of them.
--
GitLab