Upgrade Emscripten + build fixes

- Upgraded to 3.1.47.
 - EM_CACHE override leads to some new issues with package search in sysroot, probably because sysroot is hardcoded in PKG_CONFIG* variables. Use Docker's path mapping mechanism instead.
 - Added temporary workaround for new issue from https://github.com/emscripten-core/emscripten/issues/16836.
This commit is contained in:
Ingvar Stepanyan
2023-10-17 03:16:30 +01:00
parent 83cceddc63
commit cfe8ef68b6
3 changed files with 8 additions and 8 deletions

View File

@@ -16,16 +16,15 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
if [ -z "$CI" ]
then
if [ -z "$CI" ]; then
DOCKER_INTERACTIVE_OPTS="-it"
else
DOCKER_INTERACTIVE_OPTS=""
fi
docker build -t web-gphoto2 - < Dockerfile
docker build -t web-gphoto2 - <Dockerfile
docker run --rm $DOCKER_INTERACTIVE_OPTS \
-v $PWD:/src \
-u $(id -u):$(id -g) \
-v $PWD/deps/.emcache:/emsdk/upstream/emscripten/cache \
web-gphoto2 \
$@