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

Further build improvements

Browse Source
This commit is contained in:
Ingvar Stepanyan
2021-08-06 21:49:59 +00:00
parent 2665a5bc41
commit 3e071027d2
3 changed files with 46 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@@ -1,5 +1,5 @@
FROM emscripten/emsdk:2.0.26 FROM emscripten/emsdk:2.0.26
RUN apt-get update && apt-get install -qqy autoconf autopoint libtool-bin 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
CMD ["sh", "-c", "emmake make -j`nproc`"] CMD ["sh", "-c", "emmake make -j`nproc`"]

63
Makefile
View File

@@ -1,16 +1,25 @@
SYSROOT = $(PWD)/deps/.install SYSROOT = $(PWD)/deps/.install
export PKG_CONFIG_PATH = $(SYSROOT)/lib/pkgconfig
# Add custom sysroot to paths.
export CPPFLAGS += -I$(SYSROOT)/include export CPPFLAGS += -I$(SYSROOT)/include
export LDFLAGS += -L$(SYSROOT)/lib -s DYNAMIC_EXECUTION=0 -s AUTO_JS_LIBRARIES=0 -s AUTO_NATIVE_LIBRARIES=0 -s ALLOW_UNIMPLEMENTED_SYSCALLS=0 export LDFLAGS += -L$(SYSROOT)/lib
export PATH := $(SYSROOT)/bin:$(PATH)
export PKG_CONFIG_PATH = $(SYSROOT)/lib/pkgconfig
export ACLOCAL_PATH := $(SYSROOT)/share/aclocal:$(ACLOCAL_PATH)
# Common linking flags for all targets.
export LDFLAGS += -s DYNAMIC_EXECUTION=0 -s AUTO_JS_LIBRARIES=0 -s AUTO_NATIVE_LIBRARIES=0 -s ALLOW_UNIMPLEMENTED_SYSCALLS=0
# Common compilation & linking flags for all langs and targets.
COMMON_FLAGS = -Os -flto COMMON_FLAGS = -Os -flto
export CFLAGS += $(COMMON_FLAGS) export CFLAGS += $(COMMON_FLAGS)
export CXXFLAGS += $(COMMON_FLAGS) export CXXFLAGS += $(COMMON_FLAGS)
export LDFLAGS += $(COMMON_FLAGS) export LDFLAGS += $(COMMON_FLAGS)
## Main API module
libapi.mjs: api.o $(SYSROOT)/lib/libltdl.la $(SYSROOT)/lib/libgphoto2.la libapi.mjs: api.o $(SYSROOT)/lib/libltdl.la $(SYSROOT)/lib/libgphoto2.la
deps/libgphoto2/libtool --verbose --mode=link $(LD) $(LDFLAGS) -o $@ $+ \ libtool --verbose --mode=link $(LD) $(LDFLAGS) -o $@ $+ \
--bind -s ASYNCIFY -s ALLOW_MEMORY_GROWTH \ --bind -s ASYNCIFY -s ALLOW_MEMORY_GROWTH \
-dlpreopen $(SYSROOT)/lib/libgphoto2/2.5.27.1/ptp2.la \ -dlpreopen $(SYSROOT)/lib/libgphoto2/2.5.27.1/ptp2.la \
-dlpreopen $(SYSROOT)/lib/libgphoto2_port/0.12.0/usb1.la -dlpreopen $(SYSROOT)/lib/libgphoto2_port/0.12.0/usb1.la
@@ -19,32 +28,46 @@ api.o: deps/libgphoto2/configure.ac
api.o: CPPFLAGS += -Ideps/libgphoto2 -Ideps/libgphoto2/libgphoto2_port api.o: CPPFLAGS += -Ideps/libgphoto2 -Ideps/libgphoto2/libgphoto2_port
api.o: CXXFLAGS += -std=c++17 -fexceptions api.o: CXXFLAGS += -std=c++17 -fexceptions
$(SYSROOT)/.exists: ## Generic rules for deps
$(SYSROOT):
mkdir -p $(@D) mkdir -p $(@D)
touch $@
## libtool
deps/libtool/configure: deps/libtool/configure:
mkdir -p deps/libtool mkdir -p deps/libtool
curl -L https://ftpmirror.gnu.org/libtool/libtool-2.4.6.tar.gz | tar zx --strip 1 -C deps/libtool curl -L https://ftpmirror.gnu.org/libtool/libtool-2.4.6.tar.gz | tar zx --strip 1 -C deps/libtool
deps/libtool/Makefile: deps/libtool/configure
cd $(@D) && ./configure --prefix=$(SYSROOT) --disable-shared
$(SYSROOT)/lib/libltdl.la: deps/libtool/Makefile | $(SYSROOT)
$(MAKE) -C deps/libtool install
## libgphoto2
deps/libgphoto2/configure.ac deps/libusb/configure.ac &: deps/libgphoto2/configure.ac deps/libusb/configure.ac &:
git submodule update --init git submodule update --init
$(SYSROOT)/lib/libltdl.la: $(SYSROOT)/.exists deps/libtool/configure deps/libgphoto2/configure: deps/libusb/configure.ac | $(SYSROOT)/lib/libltdl.la
cd deps/libtool && \ cd $(@D) && autoreconf -fiv
./configure --prefix=$(SYSROOT) --disable-shared && \
$(MAKE) install
$(SYSROOT)/lib/libusb-1.0.la: $(SYSROOT)/.exists deps/libusb/configure.ac deps/libgphoto2/Makefile: deps/libgphoto2/configure | $(SYSROOT)/lib/libusb-1.0.la
cd deps/libusb && \
autoreconf -fiv && \
./configure --prefix=$(SYSROOT) --disable-shared --host=wasm32 && \
$(MAKE) install
$(SYSROOT)/lib/libgphoto2.la: deps/libgphoto2/configure.ac $(SYSROOT)/lib/libltdl.la $(SYSROOT)/lib/libusb-1.0.la
cd deps/libgphoto2 && \
autoreconf -fiv && \
./configure --prefix=$(SYSROOT) --disable-shared --host=wasm32 \ ./configure --prefix=$(SYSROOT) --disable-shared --host=wasm32 \
--without-libxml-2.0 --disable-nls --disable-ptpip --disable-disk \ --without-libxml-2.0 --disable-nls --disable-ptpip --disable-disk \
--with-camlibs=ptp2 && \ --with-camlibs=ptp2
$(MAKE) install
$(SYSROOT)/lib/libgphoto2.la: deps/libgphoto2/Makefile $(SYSROOT)/lib/libusb-1.0.la $(SYSROOT)/lib/libltdl.la
$(MAKE) -C deps/libgphoto2 install
## libusb
deps/libusb/configure: deps/libusb/configure.ac | $(SYSROOT)/lib/libltdl.la
cd $(@D) && autoreconf -fiv
deps/libusb/Makefile: deps/libusb/configure
cd $(@D) && ./configure --prefix=$(SYSROOT) --disable-shared --host=wasm32
$(SYSROOT)/lib/libusb-1.0.la: deps/libusb/Makefile
$(MAKE) -C deps/libusb install

3
build.sh
View File

@@ -3,4 +3,5 @@ docker build -t web-gphoto2 - < Dockerfile
docker run --rm -it \ docker run --rm -it \
-v $PWD:/src \ -v $PWD:/src \
-u $(id -u):$(id -g) \ -u $(id -u):$(id -g) \
web-gphoto2 web-gphoto2 \
$@