Changeset 4732


Ignore:
Timestamp:
Feb 5, 2014 5:52:10 AM (11 years ago)
Author:
bennylp
Message:

Re #1516: fixing multiple inclusions of crtbegin.o and -lgcc in the makefiles. The former causes link errors due to multiple symbols

Location:
pjproject/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • pjproject/trunk/aconfigure

    r4723 r4732  
    22272227$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    22282228as_fn_error $? "failed to load site script $ac_site_file 
    2229 See \`config.log' for more details" "$LINENO" 5 ; } 
     2229See \`config.log' for more details" "$LINENO" 5; } 
    22302230  fi 
    22312231done 
    … …  
    23702370case $ac_cv_build in 
    23712371*-*-*) ;; 
    2372 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; 
     2372*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; 
    23732373esac 
    23742374build=$ac_cv_build 
    … …  
    24032403case $ac_cv_host in 
    24042404*-*-*) ;; 
    2405 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; 
     2405*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; 
    24062406esac 
    24072407host=$ac_cv_host 
    … …  
    24362436case $ac_cv_target in 
    24372437*-*-*) ;; 
    2438 *) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;; 
     2438*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;; 
    24392439esac 
    24402440target=$ac_cv_target 
    … …  
    27732773$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    27742774as_fn_error $? "no acceptable C compiler found in \$PATH 
    2775 See \`config.log' for more details" "$LINENO" 5 ; } 
     2775See \`config.log' for more details" "$LINENO" 5; } 
    27762776 
    27772777# Provide some information about the compiler. 
    … …  
    28882888$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    28892889as_fn_error 77 "C compiler cannot create executables 
    2890 See \`config.log' for more details" "$LINENO" 5 ; } 
     2890See \`config.log' for more details" "$LINENO" 5; } 
    28912891else 
    28922892  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 
    … …  
    29312931$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    29322932as_fn_error $? "cannot compute suffix of executables: cannot compile and link 
    2933 See \`config.log' for more details" "$LINENO" 5 ; } 
     2933See \`config.log' for more details" "$LINENO" 5; } 
    29342934fi 
    29352935rm -f conftest conftest$ac_cv_exeext 
    … …  
    29902990as_fn_error $? "cannot run C compiled programs. 
    29912991If you meant to cross compile, use \`--host'. 
    2992 See \`config.log' for more details" "$LINENO" 5 ; } 
     2992See \`config.log' for more details" "$LINENO" 5; } 
    29932993    fi 
    29942994  fi 
    … …  
    30423042$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    30433043as_fn_error $? "cannot compute suffix of object files: cannot compile 
    3044 See \`config.log' for more details" "$LINENO" 5 ; } 
     3044See \`config.log' for more details" "$LINENO" 5; } 
    30453045fi 
    30463046rm -f conftest.$ac_cv_objext conftest.$ac_ext 
    … …  
    44374437$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    44384438as_fn_error $? "C preprocessor \"$CPP\" fails sanity check 
    4439 See \`config.log' for more details" "$LINENO" 5 ; } 
     4439See \`config.log' for more details" "$LINENO" 5; } 
    44404440fi 
    44414441 
    … …  
    49274927   *) 
    49284928     as_fn_error $? "unknown endianness 
    4929  presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5  ;; 
     4929 presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; 
    49304930 esac 
    49314931 
    … …  
    61176117case $target in 
    61186118 *android*) 
    6119         LIBS="$LIBS -llog -lgcc" 
     6119        LIBS="$LIBS -llog" 
    61206120        ;; 
    61216121 arm-apple-darwin*) 
    … …  
    71917191$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    71927192as_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 
    7193 See \`config.log' for more details" "$LINENO" 5 ; } 
     7193See \`config.log' for more details" "$LINENO" 5; } 
    71947194fi 
    71957195rm -f core conftest.err conftest.$ac_objext \ 
    … …  
    72477247$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    72487248as_fn_error $? "Unable to find to find built binaries under $IPPSAMPLES/speech-codecs/{bin,_bin}. Have you built the IPP samples? 
    7249 See \`config.log' for more details" "$LINENO" 5 ; } 
     7249See \`config.log' for more details" "$LINENO" 5; } 
    72507250            fi 
    72517251        else 
    … …  
    72537253$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    72547254as_fn_error $? "unable to find $IPPSAMPLES/speech-codecs/bin/*gcc*/lib or $IPPSAMPLES/speech-codecs/_bin/*gcc*/lib directory. Have you built the samples? 
    7255 See \`config.log' for more details" "$LINENO" 5 ; } 
     7255See \`config.log' for more details" "$LINENO" 5; } 
    72567256        fi 
    72577257 
    … …  
    72617261$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    72627262as_fn_error $? "There's something wrong with this script, directory $IPPSAMP_DIR does not exist 
    7263 See \`config.log' for more details" "$LINENO" 5 ; } 
     7263See \`config.log' for more details" "$LINENO" 5; } 
    72647264            exit 1; 
    72657265        fi 
    … …  
    72757275$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    72767276as_fn_error $? "bug in this script: unsupported IPP version 
    7277 See \`config.log' for more details" "$LINENO" 5 ; } 
     7277See \`config.log' for more details" "$LINENO" 5; } 
    72787278        fi 
    72797279 
    … …  
    72827282$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    72837283as_fn_error $? "$IPPSAMP_LIBS doesn't exist in $IPPSAMP_DIR 
    7284 See \`config.log' for more details" "$LINENO" 5 ; } 
     7284See \`config.log' for more details" "$LINENO" 5; } 
    72857285        fi 
    72867286 
    … …  
    73187318$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    73197319as_fn_error $? "failed 
    7320 See \`config.log' for more details" "$LINENO" 5 ; } 
     7320See \`config.log' for more details" "$LINENO" 5; } 
    73217321fi 
    73227322rm -f core conftest.err conftest.$ac_objext \ 
    … …  
    86308630    "third_party/build/portaudio/os-auto.mak") CONFIG_FILES="$CONFIG_FILES third_party/build/portaudio/os-auto.mak" ;; 
    86318631 
    8632   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; 
     8632  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; 
    86338633  esac 
    86348634done 
    … …  
    89478947  case $ac_mode$ac_tag in 
    89488948  :[FHL]*:*);; 
    8949   :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; 
     8949  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; 
    89508950  :[FH]-) ac_tag=-:-;; 
    89518951  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; 
    … …  
    89758975           *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; 
    89768976           esac || 
    8977            as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; 
     8977           as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; 
    89788978      esac 
    89798979      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac 
    … …  
    90029002    case $ac_tag in 
    90039003    *:-:* | *:-) cat >"$ac_tmp/stdin" \ 
    9004       || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;; 
     9004      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; 
    90059005    esac 
    90069006    ;; 

  • pjproject/trunk/aconfigure.ac

    r4723 r4732  
    692692case $target in 
    693693 *android*) 
    694         LIBS="$LIBS -llog -lgcc" 
     694        LIBS="$LIBS -llog" 
    695695        ;; 
    696696 arm-apple-darwin*) 

  • pjproject/trunk/pjsip-apps/build/Makefile

    r4711 r4732  
    4040            main.o pjsua_app.o pjsua_app_cli.o pjsua_app_common.o \ 
    4141            pjsua_app_config.o pjsua_app_legacy.o 
    42 export PJSUA_CFLAGS += $(_CFLAGS) 
    43 export PJSUA_CXXFLAGS += $(_CXXFLAGS) 
    44 export PJSUA_LDFLAGS += $(_LDFLAGS) 
     42export PJSUA_CFLAGS += $(PJ_CFLAGS) 
     43export PJSUA_CXXFLAGS += $(PJ_CXXFLAGS) 
     44export PJSUA_LDFLAGS += $(PJ_LDFLAGS) $(PJ_LDLIBS) 
    4545export PJSUA_EXE:=pjsua-$(TARGET_NAME)$(HOST_EXE) 
    4646 
    … …  
    5252export PJSYSTEST_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ 
    5353                        systest.o main_console.o 
    54 export PJSYSTEST_CFLAGS += $(_CFLAGS) 
    55 export PJSYSTEST_CXXFLAGS += $(_CXXFLAGS) 
    56 export PJSYSTEST_LDFLAGS += $(_LDFLAGS) 
     54export PJSYSTEST_CFLAGS += $(PJ_CFLAGS) 
     55export PJSYSTEST_CXXFLAGS += $(PJ_CXXFLAGS) 
     56export PJSYSTEST_LDFLAGS += $(PJ_LDFLAGS) $(PJ_LDLIBS) 
    5757export PJSYSTEST_EXE:=pjsystest-$(TARGET_NAME)$(HOST_EXE) 
    5858 
Note: See TracChangeset for help on using the changeset viewer.