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

Move dirs to base image

Browse source
This commit is contained in:
BtbN 2020-09-05 21:10:07 +02:00
parent b4878c4e1f
commit 559b42cb19
2 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
build.sh
View file

@ -44,10 +44,6 @@ docker run --rm -i -u "$(id -u):$(id -g)" -v $PWD/ffbuild:/ffbuild "$IMAGE" bash
cd ffmpeg cd ffmpeg
git checkout $GIT_BRANCH git checkout $GIT_BRANCH
export CFLAGS="\$CFLAGS -I\${FFBUILD_PREFIX}/include"
export CXXFLAGS="\$CXXFLAGS -I\${FFBUILD_PREFIX}/include"
export LDFLAGS="\$LDFLAGS -L\${FFBUILD_PREFIX}/lib"
./configure --prefix=/ffbuild/prefix --pkg-config-flags="--static" \$FFBUILD_TARGET_FLAGS $FF_CONFIGURE --extra-cflags="$FF_CFLAGS" --extra-cxxflags="$FF_CXXFLAGS" --extra-ldflags="$FF_LDFLAGS" ./configure --prefix=/ffbuild/prefix --pkg-config-flags="--static" \$FFBUILD_TARGET_FLAGS $FF_CONFIGURE --extra-cflags="$FF_CFLAGS" --extra-cxxflags="$FF_CXXFLAGS" --extra-ldflags="$FF_LDFLAGS"
make -j\$(nproc) make -j\$(nproc)
make install make install

6
images/base-win64/Dockerfile
View file

@ -18,6 +18,6 @@ ENV FFBUILD_TARGET_FLAGS="--pkg-config=pkg-config --cross-prefix=x86_64-w64-ming
FFBUILD_PREFIX=/opt/ffbuild \ FFBUILD_PREFIX=/opt/ffbuild \
FFBUILD_CMAKE_TOOLCHAIN=/toolchain.cmake \ FFBUILD_CMAKE_TOOLCHAIN=/toolchain.cmake \
PKG_CONFIG_LIBDIR=/opt/ffbuild/lib/pkgconfig \ PKG_CONFIG_LIBDIR=/opt/ffbuild/lib/pkgconfig \
CFLAGS="-static-libgcc -static-libstdc++" \ CFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include" \
CXXFLAGS="-static-libgcc -static-libstdc++" \ CXXFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include" \
LDFLAGS="-static-libgcc -static-libstdc++" LDFLAGS="-static-libgcc -static-libstdc++ -L/opt/ffbuild/lib"