dw/FFmpeg-Builds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Reduce duplication of toolchain name a bit

Browse source
This commit is contained in:
BtbN 2022-10-31 21:47:07 +01:00
parent 18e540f47d
commit 41079cb7bf
4 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
images/base-linux64/Dockerfile
View file

@ -39,10 +39,10 @@ ADD cross.meson /cross.meson
ADD gen-implib.sh /usr/bin/gen-implib ADD gen-implib.sh /usr/bin/gen-implib
RUN git clone --filter=blob:none --depth=1 https://github.com/yugr/Implib.so /opt/implib RUN git clone --filter=blob:none --depth=1 https://github.com/yugr/Implib.so /opt/implib
ENV FFBUILD_TOOLCHAIN=x86_64-ffbuild-linux-gnu
ENV PATH="/opt/ct-ng/bin:${PATH}" \ ENV PATH="/opt/ct-ng/bin:${PATH}" \
FFBUILD_TARGET_FLAGS="--pkg-config=pkg-config --cross-prefix=x86_64-ffbuild-linux-gnu- --arch=x86_64 --target-os=linux" \ FFBUILD_TARGET_FLAGS="--pkg-config=pkg-config --cross-prefix=${FFBUILD_TOOLCHAIN}- --arch=x86_64 --target-os=linux" \
FFBUILD_TOOLCHAIN=x86_64-ffbuild-linux-gnu \ FFBUILD_CROSS_PREFIX="${FFBUILD_TOOLCHAIN}-" \
FFBUILD_CROSS_PREFIX="x86_64-ffbuild-linux-gnu-" \
FFBUILD_RUST_TARGET="x86_64-unknown-linux-gnu" \ FFBUILD_RUST_TARGET="x86_64-unknown-linux-gnu" \
FFBUILD_PREFIX=/opt/ffbuild \ FFBUILD_PREFIX=/opt/ffbuild \
FFBUILD_CMAKE_TOOLCHAIN=/toolchain.cmake \ FFBUILD_CMAKE_TOOLCHAIN=/toolchain.cmake \

6
images/base-linuxarm64/Dockerfile
View file

@ -41,10 +41,10 @@ ADD cross.meson /cross.meson
ADD gen-implib.sh /usr/bin/gen-implib ADD gen-implib.sh /usr/bin/gen-implib
RUN git clone --filter=blob:none --depth=1 https://github.com/yugr/Implib.so /opt/implib RUN git clone --filter=blob:none --depth=1 https://github.com/yugr/Implib.so /opt/implib
ENV FFBUILD_TOOLCHAIN=aarch64-ffbuild-linux-gnu
ENV PATH="/opt/ct-ng/bin:${PATH}" \ ENV PATH="/opt/ct-ng/bin:${PATH}" \
FFBUILD_TARGET_FLAGS="--pkg-config=pkg-config --cross-prefix=aarch64-ffbuild-linux-gnu- --arch=aarch64 --target-os=linux" \ FFBUILD_TARGET_FLAGS="--pkg-config=pkg-config --cross-prefix=${FFBUILD_TOOLCHAIN}- --arch=aarch64 --target-os=linux" \
FFBUILD_TOOLCHAIN=aarch64-ffbuild-linux-gnu \ FFBUILD_CROSS_PREFIX="${FFBUILD_TOOLCHAIN}-" \
FFBUILD_CROSS_PREFIX="aarch64-ffbuild-linux-gnu-" \
FFBUILD_RUST_TARGET="aarch64-unknown-linux-gnu" \ FFBUILD_RUST_TARGET="aarch64-unknown-linux-gnu" \
FFBUILD_PREFIX=/opt/ffbuild \ FFBUILD_PREFIX=/opt/ffbuild \
FFBUILD_CMAKE_TOOLCHAIN=/toolchain.cmake \ FFBUILD_CMAKE_TOOLCHAIN=/toolchain.cmake \

8
images/base-win32/Dockerfile
View file

@ -24,10 +24,10 @@ RUN rustup target add i686-pc-windows-gnu
ADD toolchain.cmake /toolchain.cmake ADD toolchain.cmake /toolchain.cmake
ADD cross.meson /cross.meson ADD cross.meson /cross.meson
ENV FFBUILD_TOOLCHAIN=i686-w64-mingw32
ENV PATH="/opt/ct-ng/bin:${PATH}" \ ENV PATH="/opt/ct-ng/bin:${PATH}" \
FFBUILD_TARGET_FLAGS="--pkg-config=pkg-config --cross-prefix=i686-w64-mingw32- --arch=i686 --target-os=mingw32" \ FFBUILD_TARGET_FLAGS="--pkg-config=pkg-config --cross-prefix=${FFBUILD_TOOLCHAIN}- --arch=i686 --target-os=mingw32" \
FFBUILD_TOOLCHAIN=i686-w64-mingw32 \ FFBUILD_CROSS_PREFIX=${FFBUILD_TOOLCHAIN}- \
FFBUILD_CROSS_PREFIX=i686-w64-mingw32- \
FFBUILD_RUST_TARGET=i686-pc-windows-gnu \ FFBUILD_RUST_TARGET=i686-pc-windows-gnu \
FFBUILD_PREFIX=/opt/ffbuild \ FFBUILD_PREFIX=/opt/ffbuild \
FFBUILD_CMAKE_TOOLCHAIN=/toolchain.cmake \ FFBUILD_CMAKE_TOOLCHAIN=/toolchain.cmake \
@ -36,6 +36,6 @@ ENV PATH="/opt/ct-ng/bin:${PATH}" \
CFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -D_FORTIFY_SOURCE=2 -fstack-protector-strong" \ CFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -D_FORTIFY_SOURCE=2 -fstack-protector-strong" \
CXXFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -D_FORTIFY_SOURCE=2 -fstack-protector-strong" \ CXXFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -D_FORTIFY_SOURCE=2 -fstack-protector-strong" \
LDFLAGS="-static-libgcc -static-libstdc++ -L/opt/ffbuild/lib -O2 -pipe -fstack-protector-strong" \ LDFLAGS="-static-libgcc -static-libstdc++ -L/opt/ffbuild/lib -O2 -pipe -fstack-protector-strong" \
DLLTOOL="i686-w64-mingw32-dlltool" \ DLLTOOL="${FFBUILD_TOOLCHAIN}-dlltool" \
STAGE_CFLAGS="-fno-semantic-interposition" \ STAGE_CFLAGS="-fno-semantic-interposition" \
STAGE_CXXFLAGS="-fno-semantic-interposition" STAGE_CXXFLAGS="-fno-semantic-interposition"

8
images/base-win64/Dockerfile
View file

@ -24,10 +24,10 @@ RUN rustup target add x86_64-pc-windows-gnu
ADD toolchain.cmake /toolchain.cmake ADD toolchain.cmake /toolchain.cmake
ADD cross.meson /cross.meson ADD cross.meson /cross.meson
ENV FFBUILD_TOOLCHAIN=x86_64-w64-mingw32
ENV PATH="/opt/ct-ng/bin:${PATH}" \ ENV PATH="/opt/ct-ng/bin:${PATH}" \
FFBUILD_TARGET_FLAGS="--pkg-config=pkg-config --cross-prefix=x86_64-w64-mingw32- --arch=x86_64 --target-os=mingw32" \ FFBUILD_TARGET_FLAGS="--pkg-config=pkg-config --cross-prefix=${FFBUILD_TOOLCHAIN}- --arch=x86_64 --target-os=mingw32" \
FFBUILD_TOOLCHAIN=x86_64-w64-mingw32 \ FFBUILD_CROSS_PREFIX=${FFBUILD_TOOLCHAIN}- \
FFBUILD_CROSS_PREFIX=x86_64-w64-mingw32- \
FFBUILD_RUST_TARGET=x86_64-pc-windows-gnu \ FFBUILD_RUST_TARGET=x86_64-pc-windows-gnu \
FFBUILD_PREFIX=/opt/ffbuild \ FFBUILD_PREFIX=/opt/ffbuild \
FFBUILD_CMAKE_TOOLCHAIN=/toolchain.cmake \ FFBUILD_CMAKE_TOOLCHAIN=/toolchain.cmake \
@ -36,6 +36,6 @@ ENV PATH="/opt/ct-ng/bin:${PATH}" \
CFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -D_FORTIFY_SOURCE=2 -fstack-protector-strong" \ CFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -D_FORTIFY_SOURCE=2 -fstack-protector-strong" \
CXXFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -D_FORTIFY_SOURCE=2 -fstack-protector-strong" \ CXXFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -D_FORTIFY_SOURCE=2 -fstack-protector-strong" \
LDFLAGS="-static-libgcc -static-libstdc++ -L/opt/ffbuild/lib -O2 -pipe -fstack-protector-strong" \ LDFLAGS="-static-libgcc -static-libstdc++ -L/opt/ffbuild/lib -O2 -pipe -fstack-protector-strong" \
DLLTOOL="x86_64-w64-mingw32-dlltool" \ DLLTOOL="${FFBUILD_TOOLCHAIN}-dlltool" \
STAGE_CFLAGS="-fno-semantic-interposition" \ STAGE_CFLAGS="-fno-semantic-interposition" \
STAGE_CXXFLAGS="-fno-semantic-interposition" STAGE_CXXFLAGS="-fno-semantic-interposition"