Ignore:
Timestamp:
Jul 29, 2015 2:31:12 AM (9 years ago)
Author:
nanang
Message:

Re #1870: Fixed 64 bit arch issues on iOS: pool alignment, updated config.sub, updated lib/app file naming, lib dependencies on XCode.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • pjproject/trunk/aconfigure

    r5134 r5137  
    22592259$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    22602260as_fn_error $? "failed to load site script $ac_site_file 
    2261 See \`config.log' for more details" "$LINENO" 5 ; } 
     2261See \`config.log' for more details" "$LINENO" 5; } 
    22622262  fi 
    22632263done 
    … …  
    24022402case $ac_cv_build in 
    24032403*-*-*) ;; 
    2404 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; 
     2404*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; 
    24052405esac 
    24062406build=$ac_cv_build 
    … …  
    24352435case $ac_cv_host in 
    24362436*-*-*) ;; 
    2437 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; 
     2437*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; 
    24382438esac 
    24392439host=$ac_cv_host 
    … …  
    24682468case $ac_cv_target in 
    24692469*-*-*) ;; 
    2470 *) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;; 
     2470*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;; 
    24712471esac 
    24722472target=$ac_cv_target 
    … …  
    28052805$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    28062806as_fn_error $? "no acceptable C compiler found in \$PATH 
    2807 See \`config.log' for more details" "$LINENO" 5 ; } 
     2807See \`config.log' for more details" "$LINENO" 5; } 
    28082808 
    28092809# Provide some information about the compiler. 
    … …  
    29202920$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    29212921as_fn_error 77 "C compiler cannot create executables 
    2922 See \`config.log' for more details" "$LINENO" 5 ; } 
     2922See \`config.log' for more details" "$LINENO" 5; } 
    29232923else 
    29242924  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 
    … …  
    29632963$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    29642964as_fn_error $? "cannot compute suffix of executables: cannot compile and link 
    2965 See \`config.log' for more details" "$LINENO" 5 ; } 
     2965See \`config.log' for more details" "$LINENO" 5; } 
    29662966fi 
    29672967rm -f conftest conftest$ac_cv_exeext 
    … …  
    30223022as_fn_error $? "cannot run C compiled programs. 
    30233023If you meant to cross compile, use \`--host'. 
    3024 See \`config.log' for more details" "$LINENO" 5 ; } 
     3024See \`config.log' for more details" "$LINENO" 5; } 
    30253025    fi 
    30263026  fi 
    … …  
    30743074$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    30753075as_fn_error $? "cannot compute suffix of object files: cannot compile 
    3076 See \`config.log' for more details" "$LINENO" 5 ; } 
     3076See \`config.log' for more details" "$LINENO" 5; } 
    30773077fi 
    30783078rm -f conftest.$ac_cv_objext conftest.$ac_ext 
    … …  
    43254325$as_echo_n "checking memory alignment... " >&6; } 
    43264326case $target in 
    4327     sparc64-* | ia64-* | x86_64-* ) 
     4327    sparc64-* | ia64-* | x86_64-* | arm64-* ) 
    43284328        $as_echo "#define PJ_POOL_ALIGNMENT 8" >>confdefs.h 
    43294329 
    … …  
    44684468$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    44694469as_fn_error $? "C preprocessor \"$CPP\" fails sanity check 
    4470 See \`config.log' for more details" "$LINENO" 5 ; } 
     4470See \`config.log' for more details" "$LINENO" 5; } 
    44714471fi 
    44724472 
    … …  
    49584958   *) 
    49594959     as_fn_error $? "unknown endianness 
    4960  presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5  ;; 
     4960 presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; 
    49614961 esac 
    49624962 
    … …  
    57095709        ac_os_objs="$ac_os_objs file_access_unistd.o file_io_ansi.o os_core_unix.o os_error_unix.o os_time_unix.o os_timestamp_posix.o" 
    57105710        case $target in 
    5711           arm-apple-darwin*) 
     5711          arm*-apple-darwin*) 
    57125712                ac_os_objs="$ac_os_objs os_info_iphone.o" 
    57135713                ;; 
    … …  
    60666066$as_echo "Checking sound device backend... OpenSL ES" >&6; } 
    60676067        ;; 
    6068   arm-apple-darwin*) 
     6068  arm*-apple-darwin*) 
    60696069        LIBS="$LIBS -framework CoreAudio -framework CoreFoundation -framework AudioToolbox -framework CFNetwork -framework UIKit" 
    60706070        ac_pjmedia_audiodev_objs="coreaudio_dev.o" 
    … …  
    61526152        LIBS="$LIBS -llog" 
    61536153        ;; 
    6154  arm-apple-darwin*) 
     6154 arm*-apple-darwin*) 
    61556155        LIBS="$LIBS -framework UIKit" 
    61566156        ;; 
    … …  
    62006200        ac_android_cflags="$ac_android_cflags -DPJMEDIA_VIDEO_DEV_HAS_ANDROID=1" 
    62016201        ;; 
    6202   arm-apple-darwin*) 
     6202  arm*-apple-darwin*) 
    62036203        ac_pjmedia_video=iphone_os 
    62046204 
    … …  
    72347234 
    72357235                        case $target in 
    7236                             arm-apple-darwin*) 
     7236                            arm*-apple-darwin*) 
    72377237                                LIBYUV_LDFLAGS="-L$LIBYUV_PREFIX/out_ios/Release-iphoneos" 
    72387238                                case $ARCH in 
    … …  
    74727472$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    74737473as_fn_error $? "Error: unable to recognize your IPP installation. Make sure the paths and ARCH suffix are set correctly, run with --help for more info 
    7474 See \`config.log' for more details" "$LINENO" 5 ; } 
     7474See \`config.log' for more details" "$LINENO" 5; } 
    74757475fi 
    74767476rm -f core conftest.err conftest.$ac_objext \ 
    … …  
    75287528$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    75297529as_fn_error $? "Unable to find to find built binaries under $IPPSAMPLES/speech-codecs/{bin,_bin}. Have you built the IPP samples? 
    7530 See \`config.log' for more details" "$LINENO" 5 ; } 
     7530See \`config.log' for more details" "$LINENO" 5; } 
    75317531            fi 
    75327532        else 
    … …  
    75347534$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    75357535as_fn_error $? "unable to find $IPPSAMPLES/speech-codecs/bin/*gcc*/lib or $IPPSAMPLES/speech-codecs/_bin/*gcc*/lib directory. Have you built the samples? 
    7536 See \`config.log' for more details" "$LINENO" 5 ; } 
     7536See \`config.log' for more details" "$LINENO" 5; } 
    75377537        fi 
    75387538 
    … …  
    75427542$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    75437543as_fn_error $? "There's something wrong with this script, directory $IPPSAMP_DIR does not exist 
    7544 See \`config.log' for more details" "$LINENO" 5 ; } 
     7544See \`config.log' for more details" "$LINENO" 5; } 
    75457545            exit 1; 
    75467546        fi 
    … …  
    75567556$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    75577557as_fn_error $? "bug in this script: unsupported IPP version 
    7558 See \`config.log' for more details" "$LINENO" 5 ; } 
     7558See \`config.log' for more details" "$LINENO" 5; } 
    75597559        fi 
    75607560 
    … …  
    75637563$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    75647564as_fn_error $? "$IPPSAMP_LIBS doesn't exist in $IPPSAMP_DIR 
    7565 See \`config.log' for more details" "$LINENO" 5 ; } 
     7565See \`config.log' for more details" "$LINENO" 5; } 
    75667566        fi 
    75677567 
    … …  
    75997599$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    76007600as_fn_error $? "no 
    7601 See \`config.log' for more details" "$LINENO" 5 ; } 
     7601See \`config.log' for more details" "$LINENO" 5; } 
    76027602fi 
    76037603rm -f core conftest.err conftest.$ac_objext \ 
    … …  
    88998899    "third_party/build/portaudio/os-auto.mak") CONFIG_FILES="$CONFIG_FILES third_party/build/portaudio/os-auto.mak" ;; 
    89008900 
    8901   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; 
     8901  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; 
    89028902  esac 
    89038903done 
    … …  
    92169216  case $ac_mode$ac_tag in 
    92179217  :[FHL]*:*);; 
    9218   :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; 
     9218  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; 
    92199219  :[FH]-) ac_tag=-:-;; 
    92209220  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; 
    … …  
    92449244           *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; 
    92459245           esac || 
    9246            as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; 
     9246           as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; 
    92479247      esac 
    92489248      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac 
    … …  
    92719271    case $ac_tag in 
    92729272    *:-:* | *:-) cat >"$ac_tmp/stdin" \ 
    9273       || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;; 
     9273      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; 
    92749274    esac 
    92759275    ;; 
Note: See TracChangeset for help on using the changeset viewer.