diff options
author | Clément Bœsch <u@pkh.me> | 2017-05-03 13:51:48 +0300 |
---|---|---|
committer | Clément Bœsch <u@pkh.me> | 2017-05-03 17:49:12 +0300 |
commit | 3f17751eeb7e3348576e2597884d5e5155aadcfb (patch) | |
tree | 63d0f773c095f4293f6b35c317df964c6d0f69d5 /configure | |
parent | c3e08544100cdd7045f710bfcea33e07d9fcd25b (diff) | |
parent | 11a9320de54759340531177c9f2b1e31e6112cc2 (diff) |
Merge commit '11a9320de54759340531177c9f2b1e31e6112cc2'
* commit '11a9320de54759340531177c9f2b1e31e6112cc2':
build: Move build-system-related helper files to a separate subdirectory
"ffbuild" directory name is used instead of "avbuild".
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 25 |
1 files changed, 13 insertions, 12 deletions
@@ -77,7 +77,7 @@ Help options: --list-filters show all available filters Standard options: - --logfile=FILE log tests and output to FILE [config.log] + --logfile=FILE log tests and output to FILE [ffbuild/config.log] --disable-logging do not log configure debug information --fatal-warnings fail if any configure warning is generated --prefix=PREFIX install in PREFIX [$prefix_default] @@ -3224,7 +3224,7 @@ doc_deps_any="manpages htmlpages podpages txtpages" # default parameters -logfile="config.log" +logfile="ffbuild/config.log" # installation paths prefix_default="/usr/local" @@ -3581,6 +3581,7 @@ disable_components(){ map 'disable_components $v' $LIBRARY_LIST +mkdir -p ffbuild echo "# $0 $FFMPEG_CONFIGURATION" > $logfile set >> $logfile @@ -5152,7 +5153,7 @@ esc(){ echo "$*" | sed 's/%/%25/g;s/:/%3a/g' } -echo "config:$arch:$subarch:$cpu:$target_os:$(esc $cc_ident):$(esc $FFMPEG_CONFIGURATION)" >config.fate +echo "config:$arch:$subarch:$cpu:$target_os:$(esc $cc_ident):$(esc $FFMPEG_CONFIGURATION)" > ffbuild/config.fate check_cpp_condition stdlib.h "defined(__PIC__) || defined(__pic__) || defined(PIC)" && enable_weak pic @@ -6619,9 +6620,9 @@ test -e Makefile || echo "include $source_path/Makefile" > Makefile enabled stripping || strip="echo skipping strip" -config_files="$TMPH config.mak doc/config.texi" +config_files="$TMPH ffbuild/config.mak doc/config.texi" -cat > config.mak <<EOF +cat > ffbuild/config.mak <<EOF # Automatically generated by configure - do not modify! ifndef FFMPEG_CONFIG_MAK FFMPEG_CONFIG_MAK=1 @@ -6755,18 +6756,18 @@ get_version(){ eval $(awk "/#define ${name}_VERSION_M/ { print \$2 \"=\" \$3 }" "$file") enabled raise_major && eval ${name}_VERSION_MAJOR=$((${name}_VERSION_MAJOR+100)) eval ${name}_VERSION=\$${name}_VERSION_MAJOR.\$${name}_VERSION_MINOR.\$${name}_VERSION_MICRO - eval echo "${lcname}_VERSION=\$${name}_VERSION" >> config.mak - eval echo "${lcname}_VERSION_MAJOR=\$${name}_VERSION_MAJOR" >> config.mak - eval echo "${lcname}_VERSION_MINOR=\$${name}_VERSION_MINOR" >> config.mak + eval echo "${lcname}_VERSION=\$${name}_VERSION" >> ffbuild/config.mak + eval echo "${lcname}_VERSION_MAJOR=\$${name}_VERSION_MAJOR" >> ffbuild/config.mak + eval echo "${lcname}_VERSION_MINOR=\$${name}_VERSION_MINOR" >> ffbuild/config.mak } map 'get_version $v' $LIBRARY_LIST -map 'eval echo "${v}_FFLIBS=\$${v}_deps" >> config.mak' $LIBRARY_LIST +map 'eval echo "${v}_FFLIBS=\$${v}_deps" >> ffbuild/config.mak' $LIBRARY_LIST print_program_extralibs(){ eval "program_extralibs=\$${1}_extralibs" - eval echo "EXTRALIBS-${1}=${program_extralibs}" >> config.mak + eval echo "EXTRALIBS-${1}=${program_extralibs}" >> ffbuild/config.mak } map 'print_program_extralibs $v' $PROGRAM_LIST @@ -6816,11 +6817,11 @@ print_config CONFIG_ "$config_files" $CONFIG_LIST \ $ALL_COMPONENTS \ echo "#endif /* FFMPEG_CONFIG_H */" >> $TMPH -echo "endif # FFMPEG_CONFIG_MAK" >> config.mak +echo "endif # FFMPEG_CONFIG_MAK" >> ffbuild/config.mak # Do not overwrite an unchanged config.h to avoid superfluous rebuilds. cp_if_changed $TMPH config.h -touch .config +touch ffbuild/.config enabled yasm && cp_if_changed $TMPASM config.asm |