jon/web-dslr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Few more (final?) fixes for Docker build

Browse Source
This commit is contained in:
Ingvar Stepanyan
2021-08-09 12:42:14 +00:00
parent 43f7e941b3
commit b0dcdb7775
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@@ -1,4 +1,6 @@
FROM emscripten/emsdk:2.0.26 FROM emscripten/emsdk:2.0.26
# Update to tot to include EM_ASYNC_JS; remove once 2.0.27 is out:
RUN emsdk install tot
RUN apt-get update && apt-get install -qqy autoconf autopoint pkg-config RUN apt-get update && apt-get install -qqy autoconf autopoint pkg-config
WORKDIR /src WORKDIR /src
ENV EM_CACHE /src/deps/.emcache ENV EM_CACHE /src/deps/.emcache

4
Makefile
View File

@@ -1,7 +1,7 @@
SYSROOT = $(EM_CACHE)/sysroot SYSROOT = $(EM_CACHE)/sysroot
# Add custom sysroot to autoconf macro search # Add custom sysroot to library & macro search paths.
# (we need this because we use custom local copy of libtool) export LDFLAGS += -L$(SYSROOT)/lib
export ACLOCAL_PATH := $(SYSROOT)/share/aclocal:$(ACLOCAL_PATH) export ACLOCAL_PATH := $(SYSROOT)/share/aclocal:$(ACLOCAL_PATH)
# Common linking flags for all targets. # Common linking flags for all targets.

2
deps/libusb vendored

Submodule deps/libusb updated: 0e5f839ebb...a08df78d45