ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Thu Nov 16 13:11:52 2017 -0300| [1146a7a363ab7169a7713d774571b63287508cc8] | committer: James Almer
Merge commit 'd070b9b703a542429a13db9623109ae20474c775' * commit 'd070b9b703a542429a13db9623109ae20474c775': configure: Coalesce some arch configuration and PIC handling Merged-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1146a7a363ab7169a7713d774571b63287508cc8 --- configure | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/configure b/configure index 0fc63cbfca..3a5840ad0f 100755 --- a/configure +++ b/configure @@ -3377,6 +3377,7 @@ pkg_config_default=pkg-config ranlib_default="ranlib" strip_default="strip" version_script='--version-script' +objformat="elf32" x86asmexe_default="nasm" windres_default="windres" nvcc_default="nvcc" @@ -4820,53 +4821,45 @@ check_64bit(){ expr=$3 check_code cc "" "int test[2*($expr) - 1]" && subarch=$arch64 || subarch=$arch32 + enable $subarch } case "$arch" in aarch64|alpha|ia64) - spic=$shared + enabled shared && enable_weak pic ;; mips) check_64bit mips mips64 '_MIPS_SIM > 1' - spic=$shared + enabled shared && enable_weak pic ;; parisc) check_64bit parisc parisc64 'sizeof(void *) > 4' - spic=$shared + enabled shared && enable_weak pic ;; ppc) check_64bit ppc ppc64 'sizeof(void *) > 4' - spic=$shared + enabled shared && enable_weak pic ;; s390) check_64bit s390 s390x 'sizeof(void *) > 4' - spic=$shared + enabled shared && enable_weak pic ;; sparc) check_64bit sparc sparc64 'sizeof(void *) > 4' - spic=$shared + enabled shared && enable_weak pic ;; x86) check_64bit x86_32 x86_64 'sizeof(void *) > 4' - # Treat x32 as x64 for now. Note it also needs spic=$shared + # Treat x32 as x64 for now. Note it also needs pic if shared test "$subarch" = "x86_32" && check_cpp_condition stddef.h 'defined(__x86_64__)' && - subarch=x86_64 - if test "$subarch" = "x86_64"; then - spic=$shared + subarch=x86_64 && enable x86_64 && disable x86_32 + if enabled x86_64; then + enabled shared && enable_weak pic + objformat=elf64 fi ;; - ppc) - check_cc <<EOF && subarch="ppc64" - int test[(int)sizeof(char*) - 7]; -EOF - ;; esac -enable $subarch -enabled spic && enable_weak pic - -enabled x86_64 && objformat=elf64 || objformat="elf32" - # OS specific case $target_os in aix) ====================================================================== diff --cc configure index 0fc63cbfca,3bad7fb72c..3a5840ad0f --- a/configure +++ b/configure @@@ -3367,21 -2587,20 +3367,22 @@@ mandir_default='${prefix}/share/man # toolchain ar_default="ar" cc_default="gcc" +cxx_default="g++" host_cc_default="gcc" -x86asmexe_default="nasm" -ln_s="ln -s -f" +doxygen_default="doxygen" +install="install" +ln_s_default="ln -s -f" nm_default="nm -g" pkg_config_default=pkg-config -ranlib="ranlib" -strip="strip" +ranlib_default="ranlib" +strip_default="strip" version_script='--version-script' + objformat="elf32" - -# machine -arch_default=$(uname -m) -cpu="generic" -intrinsics="none" +x86asmexe_default="nasm" +windres_default="windres" +nvcc_default="nvcc" +nvccflags_default="-gencode arch=compute_30,code=sm_30 -O2" +striptype="direct" # OS target_os_default=$(tolower $(uname -s)) @@@ -4848,25 -3796,13 +4850,16 @@@ case "$arch" i ;; x86) check_64bit x86_32 x86_64 'sizeof(void *) > 4' - # Treat x32 as x64 for now. Note it also needs spic=$shared ++ # Treat x32 as x64 for now. Note it also needs pic if shared + test "$subarch" = "x86_32" && check_cpp_condition stddef.h 'defined(__x86_64__)' && - subarch=x86_64 - if test "$subarch" = "x86_64"; then - spic=$shared ++ subarch=x86_64 && enable x86_64 && disable x86_32 + if enabled x86_64; then + enabled shared && enable_weak pic + objformat=elf64 fi ;; - ppc) - check_cc <<EOF && subarch="ppc64" - int test[(int)sizeof(char*) - 7]; - EOF - ;; esac - enable $subarch - enabled spic && enable_weak pic - - enabled x86_64 && objformat=elf64 || objformat="elf32" - # OS specific case $target_os in aix) _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
