generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  doc: Mention the target_samples and ld variables for fate configs
  fate.sh: Allow specifying --as via a specific variable

Conflicts:
	doc/fate.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-05-29 11:19:25 +02:00
commit 4ea5aea869
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/fate_config.sh.template
View File

@ -10,11 +10,14 @@ build_only= # set to "yes" for a compile-only instance that skips tests
arch= arch=
cpu= cpu=
cross_prefix= cross_prefix=
as=
cc= cc=
ld=
target_os= target_os=
sysroot= sysroot=
target_exec= target_exec=
target_path= target_path=
target_samples=
extra_cflags= extra_cflags=
extra_ldflags= extra_ldflags=
extra_libs= extra_libs=

1
tests/fate.sh
View File

@ -49,6 +49,7 @@ configure()(
${arch:+--arch=$arch} \ ${arch:+--arch=$arch} \
${cpu:+--cpu="$cpu"} \ ${cpu:+--cpu="$cpu"} \
${cross_prefix:+--cross-prefix="$cross_prefix"} \ ${cross_prefix:+--cross-prefix="$cross_prefix"} \
${as:+--as="$as"} \
${cc:+--cc="$cc"} \ ${cc:+--cc="$cc"} \
${ld:+--ld="$ld"} \ ${ld:+--ld="$ld"} \
${target_os:+--target-os="$target_os"} \ ${target_os:+--target-os="$target_os"} \