Work on libboost compilation

povray_wasm/Dockerfile

@@ -1,11 +1,8 @@
-#!/bin/bash
-
 FROM emscripten/emsdk:latest
 
 RUN DEBIAN_FRONTEND=noninteractive apt update
 
-RUN DEBIAN_FRONTEND=noninteractive apt install -y \
-	bash \
+RUN DEBIAN_FRONTEND=noninteractive apt install -y bash \
 	libz-dev \
 	libpng-dev \
 	libjpeg-dev \
@@ -13,8 +10,23 @@ RUN DEBIAN_FRONTEND=noninteractive apt install -y \
 	libopenexr-dev \
 	autoconf \
 	automake \
-	make \
-	libboost-all-dev
+	make
+
+RUN cd /opt && git clone --recursive https://github.com/boostorg/boost.git
+
+RUN mkdir -p /opt/libboost_build
+RUN mkdir -p /opt/libboost
+
+RUN cd /opt/boost && ./bootstrap.sh --with-libraries=system,date_time,filesystem,thread
+
+RUN cd /opt/boost && ./b2 -j4 toolset=emscripten \
+	cflags="-s USE_PTHREADS=1" cxxflags="-s USE_PTHREADS=1" \
+	--prefix=/opt/libboost \
+	--build-dir=/opt/libboost_build \
+	link=static \
+	variant=release \
+	threading=single \
+	runtime-link=static 
 
 WORKDIR /usr/src/
 

povray_wasm/Dockerfile.save

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+FROM emscripten/emsdk:latest
+
+RUN DEBIAN_FRONTEND=noninteractive apt update
+
+RUN DEBIAN_FRONTEND=noninteractive apt install -y \
+	bash \
+	libz-dev \
+	libpng-dev \
+	libjpeg-dev \
+	libtiff-dev \
+	libopenexr-dev \
+	autoconf \
+	automake \
+	make \
+	libboost-all-dev
+
+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

povray_wasm/build_ubuntu.sh

@@ -3,7 +3,7 @@
 EMAIL="hi@mmcwilliams.com"
 NAME="Matt McWilliams"
 
-BOOST_ROOT="/lib/x86_64-linux-gnu/"
+BOOST_ROOT="/opt/boost/stage/lib/"
 
 CFLAGS="-pthread -DBOOST_THREAD_USE_LIB -s USE_BOOST_HEADERS=1 -s EXIT_RUNTIME=1 -s PTHREAD_POOL_SIZE=4"
 LDFLAGS="$CFLAGS -s INITIAL_MEMORY=33554432" # 33554432 bytes = 32 MB

povray_wasm/cmd.sh

@@ -1,5 +1,3 @@
 #!/bin/bash
 
-cd povray
-
-sudo docker run -v $PWD:/usr/src/build povray_wasm sh -c "${1}"
+sudo docker run -v $PWD:/usr/src/build povray_wasm sh -c "${1}"