From: Jay Freeman (saurik) Date: Tue, 31 Dec 2013 23:42:00 +0000 (-0800) Subject: Switch from MacPorts to Fink for autoconf (YAY!). X-Git-Tag: v0.9.500~128 X-Git-Url: https://git.saurik.com/cycript.git/commitdiff_plain/00a96142a6f001b5c55f227d69ee02504c81abae?hp=0ad8029fb9d317c6d2a5370ecc52f1e707f97a95 Switch from MacPorts to Fink for autoconf (YAY!). --- diff --git a/configure b/configure index ddf785a..83dfe0a 100755 --- a/configure +++ b/configure @@ -5907,7 +5907,7 @@ else if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" fi - rm -f conftest* + rm -rf conftest* fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 $as_echo "$lt_cv_nm_interface" >&6; } @@ -7273,7 +7273,7 @@ for ac_symprfx in "" "_"; do # Check to see that the pipe works correctly. pipe_works=no - rm -f conftest* + rm -rf conftest* cat > conftest.$ac_ext <<_LT_EOF #ifdef __cplusplus extern "C" { @@ -7789,7 +7789,7 @@ else if $GREP 'Manifest Tool' conftest.out > /dev/null; then lt_cv_path_mainfest_tool=yes fi - rm -f conftest* + rm -rf conftest* fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 $as_echo "$lt_cv_path_mainfest_tool" >&6; } @@ -9174,7 +9174,7 @@ ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" >conftest.$ac_ext eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` -$RM conftest* +$RM -r conftest* ac_outfile=conftest.$ac_objext echo "$lt_simple_link_test_code" >conftest.$ac_ext @@ -9231,7 +9231,7 @@ else lt_cv_prog_compiler_rtti_exceptions=yes fi fi - $RM conftest* + $RM -r conftest* fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 @@ -9608,7 +9608,7 @@ else lt_cv_prog_compiler_pic_works=yes fi fi - $RM conftest* + $RM -r conftest* fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 @@ -9720,14 +9720,14 @@ else fi fi chmod u+w . 2>&5 - $RM conftest* + $RM -r conftest* # SGI C++ compiler will create directory out/ii_files/ for # template instantiation test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files $RM out/* && rmdir out cd .. $RM -r conftest - $RM conftest* + $RM -r conftest* fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 @@ -9775,14 +9775,14 @@ else fi fi chmod u+w . 2>&5 - $RM conftest* + $RM -r conftest* # SGI C++ compiler will create directory out/ii_files/ for # template instantiation test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files $RM out/* && rmdir out cd .. $RM -r conftest - $RM conftest* + $RM -r conftest* fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 @@ -9797,7 +9797,7 @@ if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 $as_echo_n "checking if we can lock with hard links... " >&6; } hard_links=yes - $RM conftest* + $RM -r conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no @@ -11013,7 +11013,7 @@ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } if ${lt_cv_archive_cmds_need_lc+:} false; then : $as_echo_n "(cached) " >&6 else - $RM conftest* + $RM -r conftest* echo "$lt_simple_compile_test_code" > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 @@ -11048,7 +11048,7 @@ else else cat conftest.err 1>&5 fi - $RM conftest* + $RM -r conftest* fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 @@ -12914,7 +12914,7 @@ compiler=$CC echo "$lt_simple_compile_test_code" >conftest.$ac_ext eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` -$RM conftest* +$RM -r conftest* ac_outfile=conftest.$ac_objext echo "$lt_simple_link_test_code" >conftest.$ac_ext @@ -14736,7 +14736,7 @@ else lt_cv_prog_compiler_pic_works_CXX=yes fi fi - $RM conftest* + $RM -r conftest* fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 @@ -14839,14 +14839,14 @@ else fi fi chmod u+w . 2>&5 - $RM conftest* + $RM -r conftest* # SGI C++ compiler will create directory out/ii_files/ for # template instantiation test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files $RM out/* && rmdir out cd .. $RM -r conftest - $RM conftest* + $RM -r conftest* fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 @@ -14891,14 +14891,14 @@ else fi fi chmod u+w . 2>&5 - $RM conftest* + $RM -r conftest* # SGI C++ compiler will create directory out/ii_files/ for # template instantiation test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files $RM out/* && rmdir out cd .. $RM -r conftest - $RM conftest* + $RM -r conftest* fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 @@ -14913,7 +14913,7 @@ if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 $as_echo_n "checking if we can lock with hard links... " >&6; } hard_links=yes - $RM conftest* + $RM -r conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no @@ -15000,7 +15000,7 @@ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then : $as_echo_n "(cached) " >&6 else - $RM conftest* + $RM -r conftest* echo "$lt_simple_compile_test_code" > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 @@ -15035,7 +15035,7 @@ else else cat conftest.err 1>&5 fi - $RM conftest* + $RM -r conftest* fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5 @@ -15928,7 +15928,6 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -18516,7 +18515,6 @@ if test -n "$WEBKIT_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_WEBKIT_CFLAGS=`$PKG_CONFIG --cflags "$cy_webkit_pkg" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -18533,7 +18531,6 @@ if test -n "$WEBKIT_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_WEBKIT_LIBS=`$PKG_CONFIG --libs "$cy_webkit_pkg" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -18553,9 +18550,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - WEBKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$cy_webkit_pkg" 2>&1` + WEBKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$cy_webkit_pkg" 2>&1` else - WEBKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$cy_webkit_pkg" 2>&1` + WEBKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors "$cy_webkit_pkg" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$WEBKIT_PKG_ERRORS" >&5 @@ -18725,7 +18722,6 @@ if test -n "$WEBKIT_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_WEBKIT_CFLAGS=`$PKG_CONFIG --cflags "$cy_webkit_pkg" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -18742,7 +18738,6 @@ if test -n "$WEBKIT_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_WEBKIT_LIBS=`$PKG_CONFIG --libs "$cy_webkit_pkg" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -18762,9 +18757,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - WEBKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$cy_webkit_pkg" 2>&1` + WEBKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$cy_webkit_pkg" 2>&1` else - WEBKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$cy_webkit_pkg" 2>&1` + WEBKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors "$cy_webkit_pkg" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$WEBKIT_PKG_ERRORS" >&5 @@ -18934,7 +18929,6 @@ if test -n "$WEBKIT_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_WEBKIT_CFLAGS=`$PKG_CONFIG --cflags "$cy_webkit_pkg" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -18951,7 +18945,6 @@ if test -n "$WEBKIT_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_WEBKIT_LIBS=`$PKG_CONFIG --libs "$cy_webkit_pkg" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -18971,9 +18964,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - WEBKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$cy_webkit_pkg" 2>&1` + WEBKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$cy_webkit_pkg" 2>&1` else - WEBKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$cy_webkit_pkg" 2>&1` + WEBKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors "$cy_webkit_pkg" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$WEBKIT_PKG_ERRORS" >&5 @@ -19292,7 +19285,6 @@ if test -n "$LIBFFI_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBFFI_CFLAGS=`$PKG_CONFIG --cflags "libffi" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -19309,7 +19301,6 @@ if test -n "$LIBFFI_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBFFI_LIBS=`$PKG_CONFIG --libs "libffi" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -19329,9 +19320,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBFFI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libffi" 2>&1` + LIBFFI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libffi" 2>&1` else - LIBFFI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libffi" 2>&1` + LIBFFI_PKG_ERRORS=`$PKG_CONFIG --print-errors "libffi" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBFFI_PKG_ERRORS" >&5 @@ -19472,7 +19463,6 @@ if test -n "$LIBFFI_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBFFI_CFLAGS=`$PKG_CONFIG --cflags "libffi" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -19489,7 +19479,6 @@ if test -n "$LIBFFI_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBFFI_LIBS=`$PKG_CONFIG --libs "libffi" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -19509,9 +19498,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBFFI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libffi" 2>&1` + LIBFFI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libffi" 2>&1` else - LIBFFI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libffi" 2>&1` + LIBFFI_PKG_ERRORS=`$PKG_CONFIG --print-errors "libffi" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBFFI_PKG_ERRORS" >&5 diff --git a/ltmain.sh b/ltmain.sh index 9ae038c..63ae69d 100644 --- a/ltmain.sh +++ b/ltmain.sh @@ -5851,10 +5851,9 @@ func_mode_link () # -tp=* Portland pgcc target processor selection # --sysroot=* for sysroot support # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization - # -stdlib=* select c++ std lib with clang -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ - -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-stdlib=*) + -O*|-flto*|-fwhopr*|-fuse-linker-plugin) func_quote_for_eval "$arg" arg="$func_quote_for_eval_result" func_append compile_command " $arg" diff --git a/m4/libtool.m4 b/m4/libtool.m4 index 44e0ecf..dfb036f 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -934,7 +934,7 @@ ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" >conftest.$ac_ext eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` -$RM conftest* +$RM -r conftest* ])# _LT_COMPILER_BOILERPLATE @@ -1530,7 +1530,7 @@ AC_CACHE_CHECK([$1], [$2], $2=yes fi fi - $RM conftest* + $RM -r conftest* ]) if test x"[$]$2" = xyes; then @@ -2005,14 +2005,14 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], fi fi chmod u+w . 2>&AS_MESSAGE_LOG_FD - $RM conftest* + $RM -r conftest* # SGI C++ compiler will create directory out/ii_files/ for # template instantiation test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files $RM out/* && rmdir out cd .. $RM -r conftest - $RM conftest* + $RM -r conftest* ]) _LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1], [Does compiler simultaneously support -c and -o options?]) @@ -2032,7 +2032,7 @@ if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != # do not overwrite the value of need_locks provided by the user AC_MSG_CHECKING([if we can lock with hard links]) hard_links=yes - $RM conftest* + $RM -r conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no @@ -3482,7 +3482,7 @@ AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" fi - rm -f conftest*]) + rm -rf conftest*]) ])# LT_PATH_NM # Old names: @@ -3546,7 +3546,7 @@ AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool if $GREP 'Manifest Tool' conftest.out > /dev/null; then lt_cv_path_mainfest_tool=yes fi - rm -f conftest*]) + rm -rf conftest*]) if test "x$lt_cv_path_mainfest_tool" != xyes; then MANIFEST_TOOL=: fi @@ -3722,7 +3722,7 @@ for ac_symprfx in "" "_"; do # Check to see that the pipe works correctly. pipe_works=no - rm -f conftest* + rm -rf conftest* cat > conftest.$ac_ext <<_LT_EOF #ifdef __cplusplus extern "C" { @@ -5614,7 +5614,7 @@ x|xyes) # to ld, don't add -lc before -lgcc. AC_CACHE_CHECK([whether -lc should be explicitly linked in], [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1), - [$RM conftest* + [$RM -r conftest* echo "$lt_simple_compile_test_code" > conftest.$ac_ext if AC_TRY_EVAL(ac_compile) 2>conftest.err; then @@ -5641,7 +5641,7 @@ x|xyes) else cat conftest.err 1>&5 fi - $RM conftest* + $RM -r conftest* ]) _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1) ;;