From 87fbd5685a35b38cc25f1329c7ae8ccd1e689c71 Mon Sep 17 00:00:00 2001
From: native-api <vano@mail.mipt.ru>
Date: Tue, 20 Aug 2019 19:54:45 +0300
Subject: [PATCH] Don't build unused Qt features; use all cores (#236)

* Don't build unused Qt features; use all cores

* cmake does bootstrapping, too; comment unclear steps

* Use Docker comment syntax

* tab to space
---
 docker/Dockerfile_i686   | 140 +++++++++++++++++++++------------------
 docker/Dockerfile_x86_64 | 136 +++++++++++++++++++------------------
 2 files changed, 146 insertions(+), 130 deletions(-)

diff --git a/docker/Dockerfile_i686 b/docker/Dockerfile_i686
index 98d7032..cc97e66 100644
--- a/docker/Dockerfile_i686
+++ b/docker/Dockerfile_i686
@@ -1,30 +1,38 @@
 FROM quay.io/pypa/manylinux1_i686:latest
 
 RUN curl -O -L https://download.qt.io/archive/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz && \
-	tar -xf qt-everywhere-opensource-src-4.8.7.tar.gz && \
-	cd qt-everywhere* && \
-	./configure -prefix /opt/Qt4.8.7 -release -opensource -confirm-license && \
-	gmake -j5 && \
-	gmake install && \
-	cd .. && \
-	rm -rf qt-everywhere-opensource-src-4.8.7 && \
-	rm qt-everywhere-opensource-src-4.8.7.tar.gz
+    tar -xf qt-everywhere-opensource-src-4.8.7.tar.gz && \
+    cd qt-everywhere* && \
+    #configure does a bootstrap make under the hood
+    #manylinux1 is too old to have `nproc`
+    export MAKEFLAGS=-j$(getconf _NPROCESSORS_ONLN) && \
+    #OpenCV only links against QtCore, QtGui, QtTest
+    ./configure -prefix /opt/Qt4.8.7 -release -opensource -confirm-license \
+    -no-sql-sqlite -no-qt3support -no-xmlpatterns -no-multimedia \
+    -no-webkit -no-script -no-declarative -no-dbus -make libs && \
+    make && \
+    make install && \
+    cd .. && \
+    rm -rf qt-everywhere-opensource-src-4.8.7 && \
+    rm qt-everywhere-opensource-src-4.8.7.tar.gz
 
 ENV QTDIR /opt/Qt4.8.7
 ENV PATH "$QTDIR/bin:$PATH"
 
 RUN curl -O -L https://cmake.org/files/v3.9/cmake-3.9.0.tar.gz && \
-	tar -xf cmake-3.9.0.tar.gz && \
-	cd cmake-3.9.0 && \
-    true '#manylinux1 provides curl-devel equivalent and libcurl statically linked \
-         against the same newer OpenSSL as other source-built tools \
-         (1.0.2s as of this writing)' && \
-	yum -y install zlib-devel && \
-	./configure --system-curl && \
-	make -j4 && \
-	make install && \
-	cd .. && \
-	rm -rf cmake-3.9.0*
+    tar -xf cmake-3.9.0.tar.gz && \
+    cd cmake-3.9.0 && \
+    #manylinux1 provides curl-devel equivalent and libcurl statically linked
+    # against the same newer OpenSSL as other source-built tools
+    # (1.0.2s as of this writing)
+    yum -y install zlib-devel && \
+    #configure does a bootstrap make under the hood
+    export MAKEFLAGS=-j$(getconf _NPROCESSORS_ONLN) && \
+    ./configure --system-curl && \
+    make && \
+    make install && \
+    cd .. && \
+    rm -rf cmake-3.9.0*
 
 # https://trac.ffmpeg.org/wiki/CompilationGuide/Centos#GettheDependencies
 # manylinux provides the toolchain and git; we provide cmake
@@ -33,69 +41,69 @@ RUN yum install freetype-devel bzip2-devel zlib-devel -y && \
 
 # Newer openssl configure requires newer perl
 RUN curl -O -L https://www.cpan.org/src/5.0/perl-5.20.1.tar.gz && \
-	tar -xf perl-5.20.1.tar.gz && \
-	cd perl-5.20.1 && \
-	./Configure -des -Dprefix="$HOME/openssl_build" && \
-	true '#perl build scripts do much redundant work \
-	     if running "make install" separately' && \
-	make install -j4 && \
-	cd .. && \
-	rm -rf perl-5.20.1*
+    tar -xf perl-5.20.1.tar.gz && \
+    cd perl-5.20.1 && \
+    ./Configure -des -Dprefix="$HOME/openssl_build" && \
+    #perl build scripts do much redundant work
+    # if running "make install" separately
+    make install -j$(getconf _NPROCESSORS_ONLN) && \
+    cd .. && \
+    rm -rf perl-5.20.1*
 
 RUN cd ~/ffmpeg_sources && \
-	curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_1c.tar.gz && \
-	tar -xf OpenSSL_1_1_1c.tar.gz && \
-	cd openssl-OpenSSL_1_1_1c && \
-    true '#in i686, ./config detects x64 in i686 without linux32 \
-         when run from "docker build"' && \
-	PERL="$HOME/openssl_build/bin/perl" linux32 ./config --prefix="$HOME/ffmpeg_build" --openssldir="$HOME/ffmpeg_build" shared zlib && \
-	make -j4 && \
-    true '#skip installing documentation' && \
-	make install_sw && \
+    curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_1c.tar.gz && \
+    tar -xf OpenSSL_1_1_1c.tar.gz && \
+    cd openssl-OpenSSL_1_1_1c && \
+    #in i686, ./config detects x64 in i686 container without linux32
+    # when run from "docker build"
+    PERL="$HOME/openssl_build/bin/perl" linux32 ./config --prefix="$HOME/ffmpeg_build" --openssldir="$HOME/ffmpeg_build" shared zlib && \
+    make -j$(getconf _NPROCESSORS_ONLN) && \
+    #skip installing documentation
+    make install_sw && \
     rm -rf ~/openssl_build
 
 RUN cd ~/ffmpeg_sources && \
-	curl -O -L http://www.nasm.us/pub/nasm/releasebuilds/2.13.02/nasm-2.13.02.tar.bz2 && \
-	tar -xf nasm-2.13.02.tar.bz2 && cd nasm-2.13.02 && ./autogen.sh && \
-	./configure --prefix="$HOME/ffmpeg_build" --bindir="$HOME/bin" && \
-	make -j4 && \
-	make install
+    curl -O -L http://www.nasm.us/pub/nasm/releasebuilds/2.13.02/nasm-2.13.02.tar.bz2 && \
+    tar -xf nasm-2.13.02.tar.bz2 && cd nasm-2.13.02 && ./autogen.sh && \
+    ./configure --prefix="$HOME/ffmpeg_build" --bindir="$HOME/bin" && \
+    make -j$(getconf _NPROCESSORS_ONLN) && \
+    make install
 
 RUN cd ~/ffmpeg_sources && \
-	curl -O -L http://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz && \
-	tar -xf yasm-1.3.0.tar.gz && \
-	cd yasm-1.3.0 && \
-	./configure --prefix="$HOME/ffmpeg_build" --bindir="$HOME/bin" && \
-	make -j4 && \
-	make install
+    curl -O -L http://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz && \
+    tar -xf yasm-1.3.0.tar.gz && \
+    cd yasm-1.3.0 && \
+    ./configure --prefix="$HOME/ffmpeg_build" --bindir="$HOME/bin" && \
+    make -j$(getconf _NPROCESSORS_ONLN) && \
+    make install
 
 RUN cd ~/ffmpeg_sources && \
-	git clone --depth 1 https://chromium.googlesource.com/webm/libvpx.git && \
-	cd libvpx && \
-	./configure --prefix="$HOME/ffmpeg_build" --disable-examples --disable-unit-tests --enable-vp9-highbitdepth --as=yasm --enable-pic --enable-shared && \
-	make -j4 && \
-	make install
+    git clone --depth 1 https://chromium.googlesource.com/webm/libvpx.git && \
+    cd libvpx && \
+    ./configure --prefix="$HOME/ffmpeg_build" --disable-examples --disable-unit-tests --enable-vp9-highbitdepth --as=yasm --enable-pic --enable-shared && \
+    make -j$(getconf _NPROCESSORS_ONLN) && \
+    make install
 
 RUN cd ~/ffmpeg_sources && \
-	curl -O -L https://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2 && \
-	tar -xf ffmpeg-snapshot.tar.bz2 && \
-	cd ffmpeg && \
-	PATH=~/bin:$PATH && \
-	PKG_CONFIG_PATH="$HOME/ffmpeg_build/lib/pkgconfig" ./configure --prefix="$HOME/ffmpeg_build" --extra-cflags="-I$HOME/ffmpeg_build/include" --extra-ldflags="-L$HOME/ffmpeg_build/lib" --enable-openssl --enable-libvpx --enable-shared --enable-pic --bindir="$HOME/bin" && \
-	make -j4 && \
-	make install && \
-	echo "/root/ffmpeg_build/lib/" >> /etc/ld.so.conf && \
-	ldconfig && \
-	rm -rf ~/ffmpeg_sources
+    curl -O -L https://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2 && \
+    tar -xf ffmpeg-snapshot.tar.bz2 && \
+    cd ffmpeg && \
+    PATH=~/bin:$PATH && \
+    PKG_CONFIG_PATH="$HOME/ffmpeg_build/lib/pkgconfig" ./configure --prefix="$HOME/ffmpeg_build" --extra-cflags="-I$HOME/ffmpeg_build/include" --extra-ldflags="-L$HOME/ffmpeg_build/lib" --enable-openssl --enable-libvpx --enable-shared --enable-pic --bindir="$HOME/bin" && \
+    make -j$(getconf _NPROCESSORS_ONLN) && \
+    make install && \
+    echo "/root/ffmpeg_build/lib/" >> /etc/ld.so.conf && \
+    ldconfig && \
+    rm -rf ~/ffmpeg_sources
 
 ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig:/root/ffmpeg_build/lib/pkgconfig
 ENV LDFLAGS -L/root/ffmpeg_build/lib
 
 RUN curl -O https://raw.githubusercontent.com/torvalds/linux/v4.14/include/uapi/linux/videodev2.h && \
-	curl -O https://raw.githubusercontent.com/torvalds/linux/v4.14/include/uapi/linux/v4l2-common.h && \
-	curl -O https://raw.githubusercontent.com/torvalds/linux/v4.14/include/uapi/linux/v4l2-controls.h && \
-	curl -O https://raw.githubusercontent.com/torvalds/linux/v4.14/include/linux/compiler.h && \
-	mv videodev2.h v4l2-common.h v4l2-controls.h compiler.h /usr/include/linux
+    curl -O https://raw.githubusercontent.com/torvalds/linux/v4.14/include/uapi/linux/v4l2-common.h && \
+    curl -O https://raw.githubusercontent.com/torvalds/linux/v4.14/include/uapi/linux/v4l2-controls.h && \
+    curl -O https://raw.githubusercontent.com/torvalds/linux/v4.14/include/linux/compiler.h && \
+    mv videodev2.h v4l2-common.h v4l2-controls.h compiler.h /usr/include/linux
 
 #in i686, yum metadata ends up with slightly wrong timestamps
 #which inhibits its update
diff --git a/docker/Dockerfile_x86_64 b/docker/Dockerfile_x86_64
index 81b5997..f7b0b08 100644
--- a/docker/Dockerfile_x86_64
+++ b/docker/Dockerfile_x86_64
@@ -1,30 +1,38 @@
 FROM quay.io/pypa/manylinux1_x86_64:latest
 
 RUN curl -O -L https://download.qt.io/archive/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz && \
-	tar -xf qt-everywhere-opensource-src-4.8.7.tar.gz && \
-	cd qt-everywhere* && \
-	./configure -prefix /opt/Qt4.8.7 -release -opensource -confirm-license && \
-	gmake -j5 && \
-	gmake install && \
-	cd .. && \
-	rm -rf qt-everywhere-opensource-src-4.8.7 && \
-	rm qt-everywhere-opensource-src-4.8.7.tar.gz
+    tar -xf qt-everywhere-opensource-src-4.8.7.tar.gz && \
+    cd qt-everywhere* && \
+    #configure does a bootstrap make under the hood
+    #manylinux1 is too old to have `nproc`
+    export MAKEFLAGS=-j$(getconf _NPROCESSORS_ONLN) && \
+    #OpenCV only links against QtCore, QtGui, QtTest
+    ./configure -prefix /opt/Qt4.8.7 -release -opensource -confirm-license \
+    -no-sql-sqlite -no-qt3support -no-xmlpatterns -no-multimedia \
+    -no-webkit -no-script -no-declarative -no-dbus -make libs && \
+    make && \
+    make install && \
+    cd .. && \
+    rm -rf qt-everywhere-opensource-src-4.8.7 && \
+    rm qt-everywhere-opensource-src-4.8.7.tar.gz
 
 ENV QTDIR /opt/Qt4.8.7
 ENV PATH "$QTDIR/bin:$PATH"
 
 RUN curl -O -L https://cmake.org/files/v3.9/cmake-3.9.0.tar.gz && \
-	tar -xf cmake-3.9.0.tar.gz && \
-	cd cmake-3.9.0 && \
-    true '#manylinux1 provides curl-devel equivalent and libcurl statically linked \
-         against the same newer OpenSSL as other source-built tools \
-         (1.0.2s as of this writing)' && \
-	yum -y install zlib-devel && \
-	./configure --system-curl && \
-	make -j4 && \
-	make install && \
-	cd .. && \
-	rm -rf cmake-3.9.0*
+    tar -xf cmake-3.9.0.tar.gz && \
+    cd cmake-3.9.0 && \
+    #manylinux1 provides curl-devel equivalent and libcurl statically linked
+    # against the same newer OpenSSL as other source-built tools
+    # (1.0.2s as of this writing)
+    yum -y install zlib-devel && \
+    #configure does a bootstrap make under the hood
+    export MAKEFLAGS=-j$(getconf _NPROCESSORS_ONLN) && \
+    ./configure --system-curl && \
+    make && \
+    make install && \
+    cd .. && \
+    rm -rf cmake-3.9.0*
 
 # https://trac.ffmpeg.org/wiki/CompilationGuide/Centos#GettheDependencies
 # manylinux provides the toolchain and git; we provide cmake
@@ -33,66 +41,66 @@ RUN yum install freetype-devel bzip2-devel zlib-devel -y && \
 
 # Newer openssl configure requires newer perl
 RUN curl -O -L https://www.cpan.org/src/5.0/perl-5.20.1.tar.gz && \
-	tar -xf perl-5.20.1.tar.gz && \
-	cd perl-5.20.1 && \
-	./Configure -des -Dprefix="$HOME/openssl_build" && \
-	true '#perl build scripts do much redundant work \
-	     if running "make install" separately' && \
-	make install -j4 && \
-	cd .. && \
-	rm -rf perl-5.20.1*
+    tar -xf perl-5.20.1.tar.gz && \
+    cd perl-5.20.1 && \
+    ./Configure -des -Dprefix="$HOME/openssl_build" && \
+    #perl build scripts do much redundant work
+    # if running "make install" separately
+    make install -j$(getconf _NPROCESSORS_ONLN) && \
+    cd .. && \
+    rm -rf perl-5.20.1*
 
 RUN cd ~/ffmpeg_sources && \
-	curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_1c.tar.gz && \
-	tar -xf OpenSSL_1_1_1c.tar.gz && \
-	cd openssl-OpenSSL_1_1_1c && \
-	PERL="$HOME/openssl_build/bin/perl" ./config --prefix="$HOME/ffmpeg_build" --openssldir="$HOME/ffmpeg_build" shared zlib && \
-	make -j4 && \
-    true '#skip installing documentation' && \
-	make install_sw && \
+    curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_1c.tar.gz && \
+    tar -xf OpenSSL_1_1_1c.tar.gz && \
+    cd openssl-OpenSSL_1_1_1c && \
+    PERL="$HOME/openssl_build/bin/perl" ./config --prefix="$HOME/ffmpeg_build" --openssldir="$HOME/ffmpeg_build" shared zlib && \
+    make -j$(getconf _NPROCESSORS_ONLN) && \
+    #skip installing documentation
+    make install_sw && \
     rm -rf ~/openssl_build
 
 RUN cd ~/ffmpeg_sources && \
-	curl -O -L http://www.nasm.us/pub/nasm/releasebuilds/2.13.02/nasm-2.13.02.tar.bz2 && \
-	tar -xf nasm-2.13.02.tar.bz2 && cd nasm-2.13.02 && ./autogen.sh && \
-	./configure --prefix="$HOME/ffmpeg_build" --bindir="$HOME/bin" && \
-	make -j4 && \
-	make install
+    curl -O -L http://www.nasm.us/pub/nasm/releasebuilds/2.13.02/nasm-2.13.02.tar.bz2 && \
+    tar -xf nasm-2.13.02.tar.bz2 && cd nasm-2.13.02 && ./autogen.sh && \
+    ./configure --prefix="$HOME/ffmpeg_build" --bindir="$HOME/bin" && \
+    make -j$(getconf _NPROCESSORS_ONLN) && \
+    make install
 
 RUN cd ~/ffmpeg_sources && \
-	curl -O -L http://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz && \
-	tar -xf yasm-1.3.0.tar.gz && \
-	cd yasm-1.3.0 && \
-	./configure --prefix="$HOME/ffmpeg_build" --bindir="$HOME/bin" && \
-	make -j4 && \
-	make install
+    curl -O -L http://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz && \
+    tar -xf yasm-1.3.0.tar.gz && \
+    cd yasm-1.3.0 && \
+    ./configure --prefix="$HOME/ffmpeg_build" --bindir="$HOME/bin" && \
+    make -j$(getconf _NPROCESSORS_ONLN) && \
+    make install
 
 RUN cd ~/ffmpeg_sources && \
-	git clone --depth 1 https://chromium.googlesource.com/webm/libvpx.git && \
-	cd libvpx && \
-	./configure --prefix="$HOME/ffmpeg_build" --disable-examples --disable-unit-tests --enable-vp9-highbitdepth --as=yasm --enable-pic --enable-shared && \
-	make -j4 && \
-	make install
+    git clone --depth 1 https://chromium.googlesource.com/webm/libvpx.git && \
+    cd libvpx && \
+    ./configure --prefix="$HOME/ffmpeg_build" --disable-examples --disable-unit-tests --enable-vp9-highbitdepth --as=yasm --enable-pic --enable-shared && \
+    make -j$(getconf _NPROCESSORS_ONLN) && \
+    make install
 
 RUN cd ~/ffmpeg_sources && \
-	curl -O -L https://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2 && \
-	tar -xf ffmpeg-snapshot.tar.bz2 && \
-	cd ffmpeg && \
-	PATH=~/bin:$PATH && \
-	PKG_CONFIG_PATH="$HOME/ffmpeg_build/lib/pkgconfig" ./configure --prefix="$HOME/ffmpeg_build" --extra-cflags="-I$HOME/ffmpeg_build/include" --extra-ldflags="-L$HOME/ffmpeg_build/lib" --enable-openssl --enable-libvpx --enable-shared --enable-pic --bindir="$HOME/bin" && \
-	make -j4 && \
-	make install && \
-	echo "/root/ffmpeg_build/lib/" >> /etc/ld.so.conf && \
-	ldconfig && \
-	rm -rf ~/ffmpeg_sources
+    curl -O -L https://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2 && \
+    tar -xf ffmpeg-snapshot.tar.bz2 && \
+    cd ffmpeg && \
+    PATH=~/bin:$PATH && \
+    PKG_CONFIG_PATH="$HOME/ffmpeg_build/lib/pkgconfig" ./configure --prefix="$HOME/ffmpeg_build" --extra-cflags="-I$HOME/ffmpeg_build/include" --extra-ldflags="-L$HOME/ffmpeg_build/lib" --enable-openssl --enable-libvpx --enable-shared --enable-pic --bindir="$HOME/bin" && \
+    make -j$(getconf _NPROCESSORS_ONLN) && \
+    make install && \
+    echo "/root/ffmpeg_build/lib/" >> /etc/ld.so.conf && \
+    ldconfig && \
+    rm -rf ~/ffmpeg_sources
 
 ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig:/root/ffmpeg_build/lib/pkgconfig
 ENV LDFLAGS -L/root/ffmpeg_build/lib
 
 RUN curl -O https://raw.githubusercontent.com/torvalds/linux/v4.14/include/uapi/linux/videodev2.h && \
-	curl -O https://raw.githubusercontent.com/torvalds/linux/v4.14/include/uapi/linux/v4l2-common.h && \
-	curl -O https://raw.githubusercontent.com/torvalds/linux/v4.14/include/uapi/linux/v4l2-controls.h && \
-	curl -O https://raw.githubusercontent.com/torvalds/linux/v4.14/include/linux/compiler.h && \
-	mv videodev2.h v4l2-common.h v4l2-controls.h compiler.h /usr/include/linux
+    curl -O https://raw.githubusercontent.com/torvalds/linux/v4.14/include/uapi/linux/v4l2-common.h && \
+    curl -O https://raw.githubusercontent.com/torvalds/linux/v4.14/include/uapi/linux/v4l2-controls.h && \
+    curl -O https://raw.githubusercontent.com/torvalds/linux/v4.14/include/linux/compiler.h && \
+    mv videodev2.h v4l2-common.h v4l2-controls.h compiler.h /usr/include/linux
 
 ENV PATH "$HOME/bin:$PATH"
-- 
GitLab