diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-01-16 13:16:12 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-01-16 13:16:12 +0200 |
| commit | 2f00eef6b40568643150af3bdb78c8b6ccf080c2 (patch) | |
| tree | 83c60340328516dcb8778c4b019cb85c16bd6738 | |
| parent | a542ceb7e1667b7ee71c9f6bda4ea6e3f8583f53 (diff) | |
SL-14597 Fixed mac library only including symlink
| -rw-r--r-- | autobuild.xml | 12 | ||||
| -rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 2 | ||||
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 2 |
3 files changed, 9 insertions, 7 deletions
diff --git a/autobuild.xml b/autobuild.xml index a88d168f8f..cfb267cc34 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3128,9 +3128,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>archive</key> <map> <key>hash</key> - <string>e9c36803b32f1750490e159b58cc217c</string> + <string>60f008c5fd31641ad4e61ac751ce15d1</string> <key>url</key> - <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/75707/723304/uriparser-0.9.4-darwin64-555093.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/75748/723495/uriparser-0.9.4-darwin64-555117.tar.bz2</string> </map> <key>name</key> <string>darwin64</string> @@ -3164,9 +3164,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>archive</key> <map> <key>hash</key> - <string>aa90a3cf93cc7675bb8177b218de743e</string> + <string>00aff37a6f5e1fe08456702d28706cf6</string> <key>url</key> - <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/75708/723315/uriparser-0.9.4-windows-555093.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/75751/723507/uriparser-0.9.4-windows-555117.tar.bz2</string> </map> <key>name</key> <string>windows</string> @@ -3176,9 +3176,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>archive</key> <map> <key>hash</key> - <string>223077dd896ae94f212db3a163b7442d</string> + <string>ff27a91f3941c7bef5e1613a064cb048</string> <key>url</key> - <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/75709/723316/uriparser-0.9.4-windows64-555093.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/75750/723506/uriparser-0.9.4-windows64-555117.tar.bz2</string> </map> <key>name</key> <string>windows64</string> diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 578120f703..de81512eef 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -167,6 +167,8 @@ elseif(DARWIN) libnghttp2.14.dylib libnghttp2.14.19.0.dylib liburiparser.dylib + liburiparser.1.dylib + liburiparser.1.0.27.dylib ) if (FMODSTUDIO) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index bc121c92ac..0c9fd3984b 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -1036,7 +1036,7 @@ class DarwinManifest(ViewerManifest): # libnghttp2.major.dylib, which is a symlink to # libnghttp2.version.dylib. Get all of them. "libnghttp2.*dylib", - "liburiparser.dylib", + "liburiparser.*dylib", ): dylibs += path_optional(os.path.join(relpkgdir, libfile), libfile) |