From a89d38abe3f713b4c467e47261a05c404e64ff84 Mon Sep 17 00:00:00 2001 From: mattmcw Date: Fri, 22 Jul 2022 11:49:51 -0400 Subject: [PATCH] REwork of Dockerfile to convert built boost .bc files to .a for (potentially) better linking in WASM (didn't work). --- povray_wasm/Dockerfile | 14 ++++++++++++-- povray_wasm/scripts/compile.sh | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/povray_wasm/Dockerfile b/povray_wasm/Dockerfile index 6f671e5..63ae3c1 100644 --- a/povray_wasm/Dockerfile +++ b/povray_wasm/Dockerfile @@ -25,9 +25,19 @@ RUN cd /opt/boost && ./b2 -j4 toolset=emscripten \ link=static \ variant=release \ threading=single \ - runtime-link=static + runtime-link=static + +WORKDIR /opt/boost/stage/lib/ + +RUN emar q libboost_atomic.a libboost_atomic.bc +RUN emar q libboost_date_time.a libboost_date_time.bc +RUN emar q libboost_filesystem.a libboost_filesystem.bc +RUN emar q libboost_system.a libboost_system.bc +RUN emar q libboost_thread.a libboost_thread.bc WORKDIR /usr/src/ ENV POVRAY_VERSION=3.7-stable -RUN cd /usr/src/ && git clone --depth 1 --branch $POVRAY_VERSION https://github.com/POV-Ray/povray povray \ No newline at end of file +RUN cd /usr/src/ && git clone --depth 1 --branch $POVRAY_VERSION https://github.com/POV-Ray/povray povray + +WORKDIR /usr/src/povray \ No newline at end of file diff --git a/povray_wasm/scripts/compile.sh b/povray_wasm/scripts/compile.sh index 6ea9ad6..da1311e 100644 --- a/povray_wasm/scripts/compile.sh +++ b/povray_wasm/scripts/compile.sh @@ -3,4 +3,4 @@ sudo docker run \ -v $PWD/compile_povray_wasm.sh:/usr/src/povray/compile_povray_wasm.sh \ povray_wasm \ - sh -c 'cd /usr/src/povray && bash compile_povray_wasm.sh' \ No newline at end of file + sh -c 'bash compile_povray_wasm.sh' \ No newline at end of file