From 2957cccc3f30a1987b75c7eee168339809c46445 Mon Sep 17 00:00:00 2001 From: emeric Date: Mon, 11 Nov 2024 21:21:34 +0100 Subject: [PATCH] Added a way to customize make flags --- Dockerfile-release | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Dockerfile-release b/Dockerfile-release index 4dc15e78..72f8a289 100644 --- a/Dockerfile-release +++ b/Dockerfile-release @@ -2,7 +2,7 @@ FROM alpine:3.19 AS build WORKDIR /tmp/workdir -ARG PREFIX="/tmp/install" +ENV PREFIX="/tmp/install" ARG BUILD_PACKAGES=" \ ca-certificates \ @@ -36,6 +36,8 @@ ARG BUILD_PACKAGES=" \ RUN apk add --no-cache --update ${BUILD_PACKAGES} +ARG MAKEFLAGS="-j$(nproc)" + # ffmpeg ARG FFMPEG_VERSION=6.1.1 RUN \ @@ -74,7 +76,7 @@ RUN \ --enable-protocol=file,pipe \ --enable-filter=aresample \ --extra-libs=-ldl && \ - make -j$(nproc) && \ + make ${MAKEFLAGS} && \ make install && \ make distclean @@ -88,7 +90,7 @@ RUN \ RUN \ DIR=/tmp/wt && mkdir -p ${DIR} && cd ${DIR} && \ cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${PREFIX} -DBUILD_EXAMPLES=OFF -DENABLE_LIBWTTEST=OFF -DCONNECTOR_FCGI=OFF -DUSE_SYSTEM_SQLITE3=ON && \ - make -j$(nproc) && \ + make ${MAKEFLAGS} && \ make install # STB @@ -110,7 +112,7 @@ RUN \ RUN \ DIR=/tmp/taglib && mkdir -p ${DIR} && cd ${DIR} && \ CXXFLAGS="-I/usr/include/utf8cpp" cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${PREFIX} -DBUILD_SHARED_LIBS=ON -DBUILD_EXAMPLES=OFF -DBUILD_BINDINGS=OFF -DBUILD_TESTING=OFF -DTRACE_IN_RELEASE=OFF -DWITH_ZLIB=ON && \ - make -j$(nproc) && \ + make ${MAKEFLAGS} && \ make install # LMS @@ -118,7 +120,7 @@ COPY . /tmp/lms/ RUN \ DIR=/tmp/lms/build && mkdir -p ${DIR} && cd ${DIR} && \ PKG_CONFIG_PATH=/tmp/install/lib/pkgconfig CXXFLAGS="-I${PREFIX}/include" LDFLAGS="-L${PREFIX}/lib -Wl,--rpath-link=${PREFIX}/lib" cmake /tmp/lms/ -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${PREFIX} -DCMAKE_PREFIX_PATH=${PREFIX} && \ - LD_LIBRARY_PATH=${PREFIX}/lib VERBOSE=1 make -j$(nproc) && \ + LD_LIBRARY_PATH=${PREFIX}/lib VERBOSE=1 make ${MAKEFLAGS} && \ LD_LIBRARY_PATH=${PREFIX}/lib make test && \ make install && \ mkdir -p ${PREFIX}/etc/ && \