har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '192fe52e42f64a493c47cad1461b20fe1149dbea'

Browse Source 
* commit '192fe52e42f64a493c47cad1461b20fe1149dbea':
  configure: Miscellaneous minor changes to config file handling

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-11-12 00:39:41 -03:00
commit e55781954f
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
configure vendored
View File

@ -5233,12 +5233,6 @@ esac
check_compile_assert flt_lim "float.h limits.h" "DBL_MAX == (double)DBL_MAX" || check_compile_assert flt_lim "float.h limits.h" "DBL_MAX == (double)DBL_MAX" ||
add_cppflags '-I\$(SRC_PATH)/compat/float' add_cppflags '-I\$(SRC_PATH)/compat/float'
esc(){
echo "$*" | sed 's/%/%25/g;s/:/%3a/g'
}
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 check_cpp_condition stdlib.h "defined(__PIC__) || defined(__pic__) || defined(PIC)" && enable_weak pic
set_default libdir set_default libdir
@ -6742,12 +6736,21 @@ fi
echo "License: $license" echo "License: $license"
echo "Creating configuration files ..."
fi # test "$quiet" != "yes" fi # test "$quiet" != "yes"
if test -n "$WARNINGS"; then
printf "\n%s%s$WARNINGS%s" "$warn_color" "$bold_color" "$reset_color"
enabled fatal_warnings && exit 1
fi
test -e Makefile || echo "include $source_path/Makefile" > Makefile test -e Makefile || echo "include $source_path/Makefile" > Makefile
esc(){
echo "$*" | sed 's/%/%25/g;s/:/%3a/g'
}
echo "config:$arch:$subarch:$cpu:$target_os:$(esc $cc_ident):$(esc $FFMPEG_CONFIGURATION)" > ffbuild/config.fate
enabled stripping || strip="echo skipping strip" enabled stripping || strip="echo skipping strip"
enabled stripping || striptype="" enabled stripping || striptype=""
@ -6923,7 +6926,9 @@ test -n "$malloc_prefix" &&
if enabled x86asm; then if enabled x86asm; then
append config_files $TMPASM append config_files $TMPASM
printf '' >$TMPASM cat > $TMPASM <<EOF
; Automatically generated by configure - do not modify!
EOF
fi fi
enabled getenv || echo "#define getenv(x) NULL" >> $TMPH enabled getenv || echo "#define getenv(x) NULL" >> $TMPH
@ -6950,7 +6955,7 @@ touch ffbuild/.config
enabled x86asm && cp_if_changed $TMPASM config.asm enabled x86asm && cp_if_changed $TMPASM config.asm
cat > $TMPH <<EOF cat > $TMPH <<EOF
/* Generated by ffconf */ /* Generated by ffmpeg configure */
#ifndef AVUTIL_AVCONFIG_H #ifndef AVUTIL_AVCONFIG_H
#define AVUTIL_AVCONFIG_H #define AVUTIL_AVCONFIG_H
EOF EOF
@ -6978,11 +6983,6 @@ print_enabled_components(){
print_enabled_components libavcodec/bsf_list.c AVBitStreamFilter bitstream_filters $BSF_LIST print_enabled_components libavcodec/bsf_list.c AVBitStreamFilter bitstream_filters $BSF_LIST
print_enabled_components libavformat/protocol_list.c URLProtocol url_protocols $PROTOCOL_LIST print_enabled_components libavformat/protocol_list.c URLProtocol url_protocols $PROTOCOL_LIST
if test -n "$WARNINGS"; then
printf "\n%s%s$WARNINGS%s" "$warn_color" "$bold_color" "$reset_color"
enabled fatal_warnings && exit 1
fi
# Settings for pkg-config files # Settings for pkg-config files
cat > ffbuild/config.sh <<EOF cat > ffbuild/config.sh <<EOF