diff options
| author | Avi Halachmi (:avih) <avihpit@yahoo.com> | 2021-11-28 12:21:58 +0200 |
|---|---|---|
| committer | avih <avih@users.noreply.github.com> | 2021-12-01 11:00:05 +0200 |
| commit | 040d8ada0bb66fd68203ba531c7830ffa781aba1 (patch) | |
| tree | 9c4c2d1a64196bb015ac2554cb09c3272e3cb66a | |
| parent | 68c3be3e67a76712e7ffb1d55424e59071fc9348 (diff) | |
| download | mpv-build-040d8ada0bb66fd68203ba531c7830ffa781aba1.tar.bz2 mpv-build-040d8ada0bb66fd68203ba531c7830ffa781aba1.tar.xz | |
configure scripts: move fixed options to $OPTIONS (no-op)
| -rwxr-xr-x | scripts/ffmpeg-config | 4 | ||||
| -rwxr-xr-x | scripts/fribidi-config | 4 | ||||
| -rwxr-xr-x | scripts/libass-config | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/scripts/ffmpeg-config b/scripts/ffmpeg-config index 64ac613..d268e0f 100755 --- a/scripts/ffmpeg-config +++ b/scripts/ffmpeg-config @@ -11,7 +11,7 @@ if test -f "$BUILD"/ffmpeg_options ; then unset -v IFS fi -OPTIONS="--enable-gpl --disable-debug --disable-doc" +OPTIONS="--enable-gpl --disable-debug --disable-doc --enable-static --disable-shared" if "$BUILD"/scripts/test-libmpv ; then OPTIONS="$OPTIONS --enable-pic" fi @@ -43,4 +43,4 @@ echo Using ffmpeg options: $OPTIONS "$@" mkdir -p "$BUILD"/ffmpeg_build cd "$BUILD"/ffmpeg_build -"$BUILD"/ffmpeg/configure --prefix="$BUILD"/build_libs --enable-static --disable-shared $OPTIONS "$@" +"$BUILD"/ffmpeg/configure --prefix="$BUILD"/build_libs $OPTIONS "$@" diff --git a/scripts/fribidi-config b/scripts/fribidi-config index 3855248..87ba179 100755 --- a/scripts/fribidi-config +++ b/scripts/fribidi-config @@ -10,11 +10,11 @@ if test -f "$BUILD"/fribidi_options ; then unset -v IFS fi -OPTIONS= +OPTIONS="--enable-static --disable-shared --without-glib" if "$BUILD"/scripts/test-libmpv ; then OPTIONS="$OPTIONS --with-pic" fi cd "$BUILD"/fribidi ./bootstrap -./configure --prefix="$BUILD/build_libs" --libdir="$BUILD/build_libs/lib" --enable-static --disable-shared --without-glib $OPTIONS "$@" +./configure --prefix="$BUILD/build_libs" --libdir="$BUILD/build_libs/lib" $OPTIONS "$@" diff --git a/scripts/libass-config b/scripts/libass-config index 82cfe6c..f50ec53 100755 --- a/scripts/libass-config +++ b/scripts/libass-config @@ -10,7 +10,7 @@ if test -f "$BUILD"/libass_options ; then unset -v IFS fi -OPTIONS= +OPTIONS="--enable-static --disable-shared" if "$BUILD"/scripts/test-libmpv ; then OPTIONS="$OPTIONS --with-pic" fi @@ -26,6 +26,6 @@ esac cd "$BUILD"/libass # Later libass doesn't automatically run configure with autogen.sh anymore -./autogen.sh --prefix="$BUILD/build_libs" --libdir="$BUILD/build_libs/lib" --enable-static --disable-shared $OPTIONS "$@" -./configure --prefix="$BUILD/build_libs" --libdir="$BUILD/build_libs/lib" --enable-static --disable-shared $OPTIONS "$@" +./autogen.sh --prefix="$BUILD/build_libs" --libdir="$BUILD/build_libs/lib" $OPTIONS "$@" +./configure --prefix="$BUILD/build_libs" --libdir="$BUILD/build_libs/lib" $OPTIONS "$@" |