From a8f5da875a644f9f29dcbbd84f7e4d744b9f05f8 Mon Sep 17 00:00:00 2001 From: Stan Date: Thu, 1 Sep 2022 20:49:16 +0000 Subject: [PATCH] Don't mix locally installed python libs when building Patch by: @baco Differential Revision: https://code.wildfiregames.com/D4776 git-svn-id: https://svn.wildfiregames.com/public/ps/trunk@27084 3db68df2-c116-0410-a063-a993310a9797 --- binaries/data/mods/public/gui/credits/texts/programming.json | 1 + build/workspaces/update-workspaces.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/binaries/data/mods/public/gui/credits/texts/programming.json b/binaries/data/mods/public/gui/credits/texts/programming.json index d4595c737e..f8174bb70e 100644 --- a/binaries/data/mods/public/gui/credits/texts/programming.json +++ b/binaries/data/mods/public/gui/credits/texts/programming.json @@ -38,6 +38,7 @@ { "nick": "ArnH", "name": "Arno Hemelhof" }, { "nick": "Aurium", "name": "Aurélio Heckert" }, { "nick": "azayrahmad", "name": "Aziz Rahmad" }, + { "nick": "baco", "name": "Dionisio E Alonso" }, { "nick": "badmadblacksad", "name": "Martin F" }, { "nick": "badosu", "name": "Amadeus Folego" }, { "nick": "bb", "name": "Bouke Jansen" }, diff --git a/build/workspaces/update-workspaces.sh b/build/workspaces/update-workspaces.sh index 8e7ce4bf7d..0067ad2128 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} ./build.sh) || die "SpiderMonkey build failed" + (cd ../../libraries/source/spidermonkey && MAKE=${MAKE} JOBS=${JOBS} PYTHONNOUSERSITE=true ./build.sh) || die "SpiderMonkey build failed" fi echo if [ "$with_system_nvtt" = "false" ] && [ "$without_nvtt" = "false" ]; then -- 2.11.4.GIT