From a0022fb56bc3ac915183afad2c3846b3b0849cfc Mon Sep 17 00:00:00 2001 From: Itms Date: Tue, 17 Jan 2023 20:49:00 +0000 Subject: [PATCH] Fix and cleanup the SM91 build, fixes #6676. Add a new patch written by s0600204, replacing the use of `distutils` with `sysconfig` in the setup of the bundled virtualenv in SpiderMonkey. Add a patch which is a portion of https://phabricator.services.mozilla.com/D130410, fixing upstream's bug 1739486 on Fedora. This fixes build issues on recent Debian and Fedora. This is consistent with upstream's upcoming changes in ESR102 following the deprecation of `distutils`. This cleans up some old SM patches; renames the [[SVN:27442]] unicode patch; moves a Python-related environment variable inside `build.sh`; fixes indentation and EOL properties. Differential Revision: https://code.wildfiregames.com/D4893 This was SVN commit r27460. --- build/workspaces/update-workspaces.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/workspaces/update-workspaces.sh b/build/workspaces/update-workspaces.sh index 0067ad2128..8e7ce4bf7d 100755 --- a/build/workspaces/update-workspaces.sh +++ b/build/workspaces/update-workspaces.sh @@ -93,7 +93,7 @@ if [ "`uname -s`" != "Darwin" ]; then (cd ../../libraries/source/fcollada && MAKE=${MAKE} JOBS=${JOBS} ./build.sh) || die "FCollada build failed" echo if [ "$with_system_mozjs" = "false" ]; then - (cd ../../libraries/source/spidermonkey && MAKE=${MAKE} JOBS=${JOBS} PYTHONNOUSERSITE=true ./build.sh) || die "SpiderMonkey build failed" + (cd ../../libraries/source/spidermonkey && MAKE=${MAKE} JOBS=${JOBS} ./build.sh) || die "SpiderMonkey build failed" fi echo if [ "$with_system_nvtt" = "false" ] && [ "$without_nvtt" = "false" ]; then