diff options
| -rw-r--r-- | groups/241.native_packages_inet.group | 4 | ||||
| -rw-r--r-- | patches/curl-7.61.0.local.patch | 912 | ||||
| -rw-r--r-- | patches/curl-7.83.1.local.patch | 2192 |
3 files changed, 2194 insertions, 914 deletions
diff --git a/groups/241.native_packages_inet.group b/groups/241.native_packages_inet.group index d651420c..0ef1e8a7 100644 --- a/groups/241.native_packages_inet.group +++ b/groups/241.native_packages_inet.group @@ -33,8 +33,8 @@ proxytunnel rsync socat thttpd w3m weechat wget wget2 whois")"; : ${PKG_CA_CERTIFICATES_ENV_VARS_EXTRA:="HOST_CC=gcc"}; : ${PKG_CA_CERTIFICATES_VARS_FILE:="vars/ca_certificates.vars"}; : ${PKG_CURL_DEPENDS:="gnutls"}; -: ${PKG_CURL_SHA256SUM:=ef6e55192d04713673b4409ccbcb4cb6cd723137d6e10ca45b0c593a454e1720}; -: ${PKG_CURL_VERSION:=7.61.0}; +: ${PKG_CURL_SHA256SUM:=2cb9c2356e7263a1272fd1435ef7cdebf2cd21400ec287b068396deb705c22c4}; +: ${PKG_CURL_VERSION:=7.83.1}; : ${PKG_CURL_URL:=https://curl.haxx.se/download/curl-${PKG_CURL_VERSION}.tar.xz}; : ${PKG_CURL_CONFIGURE_ARGS_EXTRA:="--disable-symbol-hiding --enable-shared --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --with-ca-path=/etc/ssl/certs --with-gnutls --without-ssl"}; : ${PKG_DROPBEAR_DEPENDS:="libz"}; diff --git a/patches/curl-7.61.0.local.patch b/patches/curl-7.61.0.local.patch deleted file mode 100644 index 3794ecea..00000000 --- a/patches/curl-7.61.0.local.patch +++ /dev/null @@ -1,912 +0,0 @@ -diff -ru a/configure b/configure ---- a/configure 2018-07-09 07:52:18.000000000 +0100 -+++ b/configure 2020-03-12 08:51:25.825416713 +0000 -@@ -14553,6 +14553,16 @@ - dynamic_linker='GNU/Linux ld.so' - ;; - -+midipix) -+ dynamic_linker='ld' -+ library_names_spec='$libname.lib.a' -+ need_lib_prefix=no -+ need_version=no -+ shlibpath_overrides_runpath=yes -+ shrext_cmds=.so -+ version_type=windows -+ ;; -+ - netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no -@@ -17336,875 +17346,6 @@ - # - fi - -- -- # -- if test "$compiler_id" != "unknown"; then -- # -- tmp_save_CFLAGS="$CFLAGS" -- tmp_save_CPPFLAGS="$CPPFLAGS" -- # -- tmp_options="" -- tmp_CFLAGS="$CFLAGS" -- tmp_CPPFLAGS="$CPPFLAGS" -- -- ac_var_stripped="" -- for word1 in $tmp_CFLAGS; do -- ac_var_strip_word="no" -- for word2 in $flags_dbg_all; do -- if test "$word1" = "$word2"; then -- ac_var_strip_word="yes" -- fi -- done -- if test "$ac_var_strip_word" = "no"; then -- ac_var_stripped="$ac_var_stripped $word1" -- fi -- done -- tmp_CFLAGS="$ac_var_stripped" -- squeeze tmp_CFLAGS -- -- -- ac_var_stripped="" -- for word1 in $tmp_CPPFLAGS; do -- ac_var_strip_word="no" -- for word2 in $flags_dbg_all; do -- if test "$word1" = "$word2"; then -- ac_var_strip_word="yes" -- fi -- done -- if test "$ac_var_strip_word" = "no"; then -- ac_var_stripped="$ac_var_stripped $word1" -- fi -- done -- tmp_CPPFLAGS="$ac_var_stripped" -- squeeze tmp_CPPFLAGS -- -- # -- if test "$want_debug" = "yes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts debug enabling options" >&5 --$as_echo_n "checking if compiler accepts debug enabling options... " >&6; } -- tmp_options="$flags_dbg_yes" -- fi -- if test "$want_debug" = "no"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts debug disabling options" >&5 --$as_echo_n "checking if compiler accepts debug disabling options... " >&6; } -- tmp_options="$flags_dbg_off" -- fi -- # -- if test "$flags_prefer_cppflags" = "yes"; then -- CPPFLAGS="$tmp_CPPFLAGS $tmp_options" -- CFLAGS="$tmp_CFLAGS" -- else -- CPPFLAGS="$tmp_CPPFLAGS" -- CFLAGS="$tmp_CFLAGS $tmp_options" -- fi -- squeeze CPPFLAGS -- squeeze CFLAGS -- -- tmp_compiler_works="unknown" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- -- -- --int main (void) --{ -- -- int i = 1; -- return i; -- -- ; -- return 0; --} -- --_ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- -- tmp_compiler_works="yes" -- --else -- -- tmp_compiler_works="no" -- echo " " >&6 -- sed 's/^/cc-fail: /' conftest.err >&6 -- echo " " >&6 -- --fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- if test "$tmp_compiler_works" = "yes"; then -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- -- -- --int main (void) --{ -- -- int i = 1; -- return i; -- -- ; -- return 0; --} -- --_ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- -- tmp_compiler_works="yes" -- --else -- -- tmp_compiler_works="no" -- echo " " >&6 -- sed 's/^/link-fail: /' conftest.err >&6 -- echo " " >&6 -- --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -- fi -- if test "x$cross_compiling" != "xyes" && -- test "$tmp_compiler_works" = "yes"; then -- if test "$cross_compiling" = yes; then : -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error $? "cannot run test program while cross compiling --See \`config.log' for more details" "$LINENO" 5; } --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- -- --# ifdef __STDC__ --# include <stdlib.h> --# endif -- --int main (void) --{ -- -- int i = 0; -- exit(i); -- -- ; -- return 0; --} -- --_ACEOF --if ac_fn_c_try_run "$LINENO"; then : -- -- tmp_compiler_works="yes" -- --else -- -- tmp_compiler_works="no" -- echo " " >&6 -- echo "run-fail: test program exited with status $ac_status" >&6 -- echo " " >&6 -- --fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext --fi -- -- fi -- if test "$tmp_compiler_works" = "yes"; then -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- { $as_echo "$as_me:${as_lineno-$LINENO}: compiler options added: $tmp_options" >&5 --$as_echo "$as_me: compiler options added: $tmp_options" >&6;} -- -- else -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: compiler options rejected: $tmp_options" >&5 --$as_echo "$as_me: WARNING: compiler options rejected: $tmp_options" >&2;} -- CPPFLAGS="$tmp_save_CPPFLAGS" -- CFLAGS="$tmp_save_CFLAGS" -- -- fi -- -- # -- fi -- -- -- # -- if test "$compiler_id" != "unknown"; then -- # -- tmp_save_CFLAGS="$CFLAGS" -- tmp_save_CPPFLAGS="$CPPFLAGS" -- # -- tmp_options="" -- tmp_CFLAGS="$CFLAGS" -- tmp_CPPFLAGS="$CPPFLAGS" -- honor_optimize_option="yes" -- # -- # -- if test "$want_optimize" = "assume_no" || -- test "$want_optimize" = "assume_yes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler optimizer assumed setting might be used" >&5 --$as_echo_n "checking if compiler optimizer assumed setting might be used... " >&6; } -- -- -- ac_var_match_word="no" -- for word1 in $tmp_CFLAGS; do -- for word2 in $flags_opt_all; do -- if test "$word1" = "$word2"; then -- ac_var_match_word="yes" -- fi -- done -- done -- -- if test "$ac_var_match_word" = "yes"; then -- -- honor_optimize_option="no" -- -- -- fi -- -- -- -- ac_var_match_word="no" -- for word1 in $tmp_CPPFLAGS; do -- for word2 in $flags_opt_all; do -- if test "$word1" = "$word2"; then -- ac_var_match_word="yes" -- fi -- done -- done -- -- if test "$ac_var_match_word" = "yes"; then -- -- honor_optimize_option="no" -- -- -- fi -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $honor_optimize_option" >&5 --$as_echo "$honor_optimize_option" >&6; } -- if test "$honor_optimize_option" = "yes"; then -- if test "$want_optimize" = "assume_yes"; then -- want_optimize="yes" -- fi -- if test "$want_optimize" = "assume_no"; then -- want_optimize="no" -- fi -- fi -- fi -- # -- if test "$honor_optimize_option" = "yes"; then -- -- ac_var_stripped="" -- for word1 in $tmp_CFLAGS; do -- ac_var_strip_word="no" -- for word2 in $flags_opt_all; do -- if test "$word1" = "$word2"; then -- ac_var_strip_word="yes" -- fi -- done -- if test "$ac_var_strip_word" = "no"; then -- ac_var_stripped="$ac_var_stripped $word1" -- fi -- done -- tmp_CFLAGS="$ac_var_stripped" -- squeeze tmp_CFLAGS -- -- -- ac_var_stripped="" -- for word1 in $tmp_CPPFLAGS; do -- ac_var_strip_word="no" -- for word2 in $flags_opt_all; do -- if test "$word1" = "$word2"; then -- ac_var_strip_word="yes" -- fi -- done -- if test "$ac_var_strip_word" = "no"; then -- ac_var_stripped="$ac_var_stripped $word1" -- fi -- done -- tmp_CPPFLAGS="$ac_var_stripped" -- squeeze tmp_CPPFLAGS -- -- if test "$want_optimize" = "yes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts optimizer enabling options" >&5 --$as_echo_n "checking if compiler accepts optimizer enabling options... " >&6; } -- tmp_options="$flags_opt_yes" -- fi -- if test "$want_optimize" = "no"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts optimizer disabling options" >&5 --$as_echo_n "checking if compiler accepts optimizer disabling options... " >&6; } -- tmp_options="$flags_opt_off" -- fi -- if test "$flags_prefer_cppflags" = "yes"; then -- CPPFLAGS="$tmp_CPPFLAGS $tmp_options" -- CFLAGS="$tmp_CFLAGS" -- else -- CPPFLAGS="$tmp_CPPFLAGS" -- CFLAGS="$tmp_CFLAGS $tmp_options" -- fi -- squeeze CPPFLAGS -- squeeze CFLAGS -- -- tmp_compiler_works="unknown" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- -- -- --int main (void) --{ -- -- int i = 1; -- return i; -- -- ; -- return 0; --} -- --_ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- -- tmp_compiler_works="yes" -- --else -- -- tmp_compiler_works="no" -- echo " " >&6 -- sed 's/^/cc-fail: /' conftest.err >&6 -- echo " " >&6 -- --fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- if test "$tmp_compiler_works" = "yes"; then -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- -- -- --int main (void) --{ -- -- int i = 1; -- return i; -- -- ; -- return 0; --} -- --_ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- -- tmp_compiler_works="yes" -- --else -- -- tmp_compiler_works="no" -- echo " " >&6 -- sed 's/^/link-fail: /' conftest.err >&6 -- echo " " >&6 -- --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -- fi -- if test "x$cross_compiling" != "xyes" && -- test "$tmp_compiler_works" = "yes"; then -- if test "$cross_compiling" = yes; then : -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error $? "cannot run test program while cross compiling --See \`config.log' for more details" "$LINENO" 5; } --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- -- --# ifdef __STDC__ --# include <stdlib.h> --# endif -- --int main (void) --{ -- -- int i = 0; -- exit(i); -- -- ; -- return 0; --} -- --_ACEOF --if ac_fn_c_try_run "$LINENO"; then : -- -- tmp_compiler_works="yes" -- --else -- -- tmp_compiler_works="no" -- echo " " >&6 -- echo "run-fail: test program exited with status $ac_status" >&6 -- echo " " >&6 -- --fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext --fi -- -- fi -- if test "$tmp_compiler_works" = "yes"; then -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- { $as_echo "$as_me:${as_lineno-$LINENO}: compiler options added: $tmp_options" >&5 --$as_echo "$as_me: compiler options added: $tmp_options" >&6;} -- -- else -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: compiler options rejected: $tmp_options" >&5 --$as_echo "$as_me: WARNING: compiler options rejected: $tmp_options" >&2;} -- CPPFLAGS="$tmp_save_CPPFLAGS" -- CFLAGS="$tmp_save_CFLAGS" -- -- fi -- -- fi -- # -- fi -- -- -- # -- if test "$compiler_id" != "unknown"; then -- # -- tmp_save_CPPFLAGS="$CPPFLAGS" -- tmp_save_CFLAGS="$CFLAGS" -- tmp_CPPFLAGS="" -- tmp_CFLAGS="" -- # -- case "$compiler_id" in -- # -- CLANG) -- # -- if test "$want_warnings" = "yes"; then -- tmp_CFLAGS="$tmp_CFLAGS -pedantic" -- tmp_CFLAGS="$tmp_CFLAGS -Wall -Wextra" -- tmp_CFLAGS="$tmp_CFLAGS -Wpointer-arith -Wwrite-strings" -- tmp_CFLAGS="$tmp_CFLAGS -Wshadow" -- tmp_CFLAGS="$tmp_CFLAGS -Winline -Wnested-externs" -- tmp_CFLAGS="$tmp_CFLAGS -Wmissing-declarations" -- tmp_CFLAGS="$tmp_CFLAGS -Wmissing-prototypes" -- tmp_CFLAGS="$tmp_CFLAGS -Wno-long-long" -- tmp_CFLAGS="$tmp_CFLAGS -Wfloat-equal" -- tmp_CFLAGS="$tmp_CFLAGS -Wno-multichar -Wsign-compare" -- tmp_CFLAGS="$tmp_CFLAGS -Wundef" -- tmp_CFLAGS="$tmp_CFLAGS -Wno-format-nonliteral" -- tmp_CFLAGS="$tmp_CFLAGS -Wendif-labels -Wstrict-prototypes" -- tmp_CFLAGS="$tmp_CFLAGS -Wdeclaration-after-statement" -- tmp_CFLAGS="$tmp_CFLAGS -Wcast-align" -- tmp_CFLAGS="$tmp_CFLAGS -Wno-system-headers" -- tmp_CFLAGS="$tmp_CFLAGS -Wshorten-64-to-32" -- # -- if test "$compiler_num" -ge "101"; then -- tmp_CFLAGS="$tmp_CFLAGS -Wunused" -- fi -- # -- if test "$compiler_num" -ge "208"; then -- tmp_CFLAGS="$tmp_CFLAGS -Wvla" -- fi -- # -- if test "$compiler_num" -ge "209"; then -- tmp_CFLAGS="$tmp_CFLAGS -Wshift-sign-overflow" -- fi -- # -- if test "$compiler_num" -ge "302"; then -- case $host_os in -- cygwin* | mingw*) -- ;; -- *) -- tmp_CFLAGS="$tmp_CFLAGS -Wmissing-variable-declarations" -- ;; -- esac -- fi -- # -- if test "$compiler_num" -ge "306"; then -- tmp_CFLAGS="$tmp_CFLAGS -Wdouble-promotion" -- fi -- # -- if test "$compiler_num" -ge "309"; then -- tmp_CFLAGS="$tmp_CFLAGS -Wcomma" -- # avoid the varargs warning, fixed in 4.0 -- # https://bugs.llvm.org/show_bug.cgi?id=29140 -- if test "$compiler_num" -lt "400"; then -- tmp_CFLAGS="$tmp_CFLAGS -Wno-varargs" -- fi -- fi -- fi -- ;; -- # -- DEC_C) -- # -- if test "$want_warnings" = "yes"; then -- tmp_CFLAGS="$tmp_CFLAGS -msg_enable level3" -- fi -- ;; -- # -- GNU_C) -- # -- if test "$want_warnings" = "yes"; then -- # -- if test "x$cross_compiling" != "xyes" || -- test "$compiler_num" -ge "300"; then -- tmp_CFLAGS="$tmp_CFLAGS -pedantic" -- fi -- # -- tmp_CFLAGS="$tmp_CFLAGS -Wall -W" -- # -- if test "$compiler_num" -ge "104"; then -- tmp_CFLAGS="$tmp_CFLAGS -Wpointer-arith -Wwrite-strings" -- if test "x$cross_compiling" != "xyes" || -- test "$compiler_num" -ge "300"; then -- tmp_CFLAGS="$tmp_CFLAGS -Wunused -Wshadow" -- fi -- fi -- # -- if test "$compiler_num" -ge "207"; then -- tmp_CFLAGS="$tmp_CFLAGS -Winline -Wnested-externs" -- if test "x$cross_compiling" != "xyes" || -- test "$compiler_num" -ge "300"; then -- tmp_CFLAGS="$tmp_CFLAGS -Wmissing-declarations" -- tmp_CFLAGS="$tmp_CFLAGS -Wmissing-prototypes" -- fi -- fi -- # -- if test "$compiler_num" -ge "295"; then -- tmp_CFLAGS="$tmp_CFLAGS -Wno-long-long" -- fi -- # -- if test "$compiler_num" -ge "296"; then -- tmp_CFLAGS="$tmp_CFLAGS -Wfloat-equal" -- tmp_CFLAGS="$tmp_CFLAGS -Wno-multichar -Wsign-compare" -- tmp_CFLAGS="$tmp_CFLAGS -Wundef" -- fi -- # -- if test "$compiler_num" -ge "297"; then -- tmp_CFLAGS="$tmp_CFLAGS -Wno-format-nonliteral" -- fi -- # -- if test "$compiler_num" -ge "300"; then -- tmp_CFLAGS="$tmp_CFLAGS" -- fi -- # -- if test "$compiler_num" -ge "303"; then -- tmp_CFLAGS="$tmp_CFLAGS -Wendif-labels -Wstrict-prototypes" -- fi -- # -- if test "$compiler_num" -ge "304"; then -- tmp_CFLAGS="$tmp_CFLAGS -Wdeclaration-after-statement" -- fi -- # -- if test "$compiler_num" -ge "400"; then -- tmp_CFLAGS="$tmp_CFLAGS -Wstrict-aliasing=3" -- fi -- # -- if test "$compiler_num" -ge "402"; then -- tmp_CFLAGS="$tmp_CFLAGS -Wcast-align" -- fi -- # -- if test "$compiler_num" -ge "403"; then -- tmp_CFLAGS="$tmp_CFLAGS -Wtype-limits -Wold-style-declaration" -- tmp_CFLAGS="$tmp_CFLAGS -Wmissing-parameter-type -Wempty-body" -- tmp_CFLAGS="$tmp_CFLAGS -Wclobbered -Wignored-qualifiers" -- tmp_CFLAGS="$tmp_CFLAGS -Wconversion -Wno-sign-conversion -Wvla" -- fi -- # -- if test "$compiler_num" -ge "405"; then -- if test "$curl_cv_have_def__WIN32" = "yes"; then -- tmp_CFLAGS="$tmp_CFLAGS -Wno-pedantic-ms-format" -- fi -- fi -- # -- if test "$compiler_num" -ge "406"; then -- tmp_CFLAGS="$tmp_CFLAGS -Wdouble-promotion" -- fi -- # -- if test "$compiler_num" -ge "600"; then -- tmp_CFLAGS="$tmp_CFLAGS -Wshift-negative-value" -- tmp_CFLAGS="$tmp_CFLAGS -Wshift-overflow=2" -- tmp_CFLAGS="$tmp_CFLAGS -Wnull-dereference" -- tmp_CFLAGS="$tmp_CFLAGS -Wduplicated-cond" -- fi -- # -- if test "$compiler_num" -ge "700"; then -- tmp_CFLAGS="$tmp_CFLAGS -Wduplicated-branches" -- tmp_CFLAGS="$tmp_CFLAGS -Wrestrict" -- tmp_CFLAGS="$tmp_CFLAGS -Walloc-zero" -- tmp_CFLAGS="$tmp_CFLAGS -Wformat-overflow=2" -- tmp_CFLAGS="$tmp_CFLAGS -Wformat-truncation=2" -- fi -- # -- fi -- # -- if test "$compiler_num" -ge "300"; then -- tmp_CFLAGS="$tmp_CFLAGS -Wno-system-headers" -- else -- if test "x$cross_compiling" = "xyes"; then -- if test "$compiler_num" -ge "104"; then -- tmp_CFLAGS="$tmp_CFLAGS -Wno-unused -Wno-shadow" -- fi -- if test "$compiler_num" -ge "207"; then -- tmp_CFLAGS="$tmp_CFLAGS -Wno-missing-declarations" -- tmp_CFLAGS="$tmp_CFLAGS -Wno-missing-prototypes" -- fi -- fi -- fi -- ;; -- # -- HP_UX_C) -- # -- if test "$want_warnings" = "yes"; then -- tmp_CFLAGS="$tmp_CFLAGS +w1" -- fi -- ;; -- # -- IBM_C) -- # -- tmp_CFLAGS="$tmp_CFLAGS" -- ;; -- # -- INTEL_UNIX_C) -- # -- if test "$want_warnings" = "yes"; then -- if test "$compiler_num" -gt "600"; then -- tmp_CPPFLAGS="$tmp_CPPFLAGS -Wall -w2" -- tmp_CPPFLAGS="$tmp_CPPFLAGS -Wcheck" -- tmp_CPPFLAGS="$tmp_CPPFLAGS -Wcomment" -- tmp_CPPFLAGS="$tmp_CPPFLAGS -Wdeprecated" -- tmp_CPPFLAGS="$tmp_CPPFLAGS -Wmissing-prototypes" -- tmp_CPPFLAGS="$tmp_CPPFLAGS -Wp64" -- tmp_CPPFLAGS="$tmp_CPPFLAGS -Wpointer-arith" -- tmp_CPPFLAGS="$tmp_CPPFLAGS -Wreturn-type" -- tmp_CPPFLAGS="$tmp_CPPFLAGS -Wshadow" -- tmp_CPPFLAGS="$tmp_CPPFLAGS -Wuninitialized" -- tmp_CPPFLAGS="$tmp_CPPFLAGS -Wunused-function" -- fi -- fi -- tmp_CFLAGS="$tmp_CFLAGS -fno-omit-frame-pointer" -- tmp_CFLAGS="$tmp_CFLAGS -fno-strict-aliasing" -- tmp_CFLAGS="$tmp_CFLAGS -fp-model precise" -- if test "$compiler_num" -ge "1000"; then -- tmp_CFLAGS="$tmp_CFLAGS -vec-report0" -- fi -- ;; -- # -- INTEL_WINDOWS_C) -- # -- tmp_CFLAGS="$tmp_CFLAGS" -- ;; -- # -- LCC) -- # -- if test "$want_warnings" = "yes"; then -- tmp_CFLAGS="$tmp_CFLAGS" -- fi -- ;; -- # -- SGI_MIPS_C) -- # -- if test "$want_warnings" = "yes"; then -- tmp_CFLAGS="$tmp_CFLAGS -fullwarn" -- fi -- ;; -- # -- SGI_MIPSPRO_C) -- # -- if test "$want_warnings" = "yes"; then -- tmp_CFLAGS="$tmp_CFLAGS -fullwarn" -- tmp_CFLAGS="$tmp_CFLAGS -woff 1209" -- fi -- ;; -- # -- SUNPRO_C) -- # -- if test "$want_warnings" = "yes"; then -- tmp_CFLAGS="$tmp_CFLAGS -v" -- fi -- ;; -- # -- TINY_C) -- # -- if test "$want_warnings" = "yes"; then -- tmp_CFLAGS="$tmp_CFLAGS -Wall" -- tmp_CFLAGS="$tmp_CFLAGS -Wwrite-strings" -- tmp_CFLAGS="$tmp_CFLAGS -Wunsupported" -- fi -- ;; -- # -- WATCOM_UNIX_C) -- # -- if test "$want_warnings" = "yes"; then -- tmp_CFLAGS="$tmp_CFLAGS -Wall -Wextra" -- fi -- ;; -- # -- WATCOM_WINDOWS_C) -- # -- tmp_CFLAGS="$tmp_CFLAGS" -- ;; -- # -- esac -- # -- squeeze tmp_CPPFLAGS -- squeeze tmp_CFLAGS -- # -- if test ! -z "$tmp_CFLAGS" || test ! -z "$tmp_CPPFLAGS"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts strict warning options" >&5 --$as_echo_n "checking if compiler accepts strict warning options... " >&6; } -- CPPFLAGS="$tmp_save_CPPFLAGS $tmp_CPPFLAGS" -- CFLAGS="$tmp_save_CFLAGS $tmp_CFLAGS" -- squeeze CPPFLAGS -- squeeze CFLAGS -- -- tmp_compiler_works="unknown" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- -- -- --int main (void) --{ -- -- int i = 1; -- return i; -- -- ; -- return 0; --} -- --_ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- -- tmp_compiler_works="yes" -- --else -- -- tmp_compiler_works="no" -- echo " " >&6 -- sed 's/^/cc-fail: /' conftest.err >&6 -- echo " " >&6 -- --fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- if test "$tmp_compiler_works" = "yes"; then -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- -- -- --int main (void) --{ -- -- int i = 1; -- return i; -- -- ; -- return 0; --} -- --_ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- -- tmp_compiler_works="yes" -- --else -- -- tmp_compiler_works="no" -- echo " " >&6 -- sed 's/^/link-fail: /' conftest.err >&6 -- echo " " >&6 -- --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -- fi -- if test "x$cross_compiling" != "xyes" && -- test "$tmp_compiler_works" = "yes"; then -- if test "$cross_compiling" = yes; then : -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error $? "cannot run test program while cross compiling --See \`config.log' for more details" "$LINENO" 5; } --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- -- --# ifdef __STDC__ --# include <stdlib.h> --# endif -- --int main (void) --{ -- -- int i = 0; -- exit(i); -- -- ; -- return 0; --} -- --_ACEOF --if ac_fn_c_try_run "$LINENO"; then : -- -- tmp_compiler_works="yes" -- --else -- -- tmp_compiler_works="no" -- echo " " >&6 -- echo "run-fail: test program exited with status $ac_status" >&6 -- echo " " >&6 -- --fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext --fi -- -- fi -- if test "$tmp_compiler_works" = "yes"; then -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- { $as_echo "$as_me:${as_lineno-$LINENO}: compiler options added: $tmp_CFLAGS $tmp_CPPFLAGS" >&5 --$as_echo "$as_me: compiler options added: $tmp_CFLAGS $tmp_CPPFLAGS" >&6;} -- -- else -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: compiler options rejected: $tmp_CFLAGS $tmp_CPPFLAGS" >&5 --$as_echo "$as_me: WARNING: compiler options rejected: $tmp_CFLAGS $tmp_CPPFLAGS" >&2;} -- CPPFLAGS="$tmp_save_CPPFLAGS" -- CFLAGS="$tmp_save_CFLAGS" -- -- fi -- -- fi -- # -- fi -- -- --if test "$compiler_id" = "INTEL_UNIX_C"; then -- # -- if test "$compiler_num" -ge "1000"; then -- CFLAGS="$CFLAGS -shared-intel" -- elif test "$compiler_num" -ge "900"; then -- CFLAGS="$CFLAGS -i-dynamic" -- fi -- # --fi -- -- - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler halts on compilation errors" >&5 - $as_echo_n "checking if compiler halts on compilation errors... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -diff -ru a/curl-config.in b/curl-config.in ---- a/curl-config.in 2018-06-14 10:31:24.000000000 -0400 -+++ b/curl-config.in 2020-03-27 15:39:03.029645413 -0400 -@@ -143,11 +143,7 @@ - ;; - - --libs) -- if test "X@libdir@" != "X/usr/lib" -a "X@libdir@" != "X/usr/lib64"; then -- CURLLIBDIR="-L@libdir@ " -- else -- CURLLIBDIR="" -- fi -+ CURLLIBDIR="" - if test "X@REQUIRE_LIB_DEPS@" = "Xyes"; then - echo ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@ - else diff --git a/patches/curl-7.83.1.local.patch b/patches/curl-7.83.1.local.patch new file mode 100644 index 00000000..365d6ab1 --- /dev/null +++ b/patches/curl-7.83.1.local.patch @@ -0,0 +1,2192 @@ +--- curl-7.83.1/configure.orig 2022-05-09 11:03:42.000000000 +0200 ++++ curl-7.83.1/configure 2022-05-11 16:30:58.671831912 +0200 +@@ -15337,6 +15337,16 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++midipix) ++ dynamic_linker='ld' ++ library_names_spec='$libname.lib.a' ++ need_lib_prefix=no ++ need_version=no ++ shlibpath_overrides_runpath=yes ++ shrext_cmds=.so ++ version_type=windows ++ ;; ++ + netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no +@@ -17792,2132 +17802,6 @@ + return 0 + } + +- +- # +- if test "$compiler_id" != "unknown"; then +- # +- tmp_save_CPPFLAGS="$CPPFLAGS" +- tmp_save_CFLAGS="$CFLAGS" +- tmp_CPPFLAGS="" +- tmp_CFLAGS="" +- # +- case "$compiler_id" in +- # +- CLANG) +- # +- tmp_CFLAGS="$tmp_CFLAGS -Qunused-arguments" +- tmp_CFLAGS="$tmp_CFLAGS -Wno-pointer-bool-conversion" +- ;; +- # +- DEC_C) +- # +- tmp_CFLAGS="$tmp_CFLAGS -std1" +- tmp_CFLAGS="$tmp_CFLAGS -noansi_alias" +- tmp_CFLAGS="$tmp_CFLAGS -warnprotos" +- tmp_CFLAGS="$tmp_CFLAGS -msg_fatal toofewargs,toomanyargs" +- ;; +- # +- GNU_C) +- # +- if test "$compiler_num" -ge "295"; then +- tmp_CFLAGS="$tmp_CFLAGS -Werror-implicit-function-declaration" +- fi +- ;; +- # +- HP_UX_C) +- # +- tmp_CFLAGS="$tmp_CFLAGS -z" +- tmp_CFLAGS="$tmp_CFLAGS +W 4227,4255" +- ;; +- # +- IBM_C) +- # +- tmp_CPPFLAGS="$tmp_CPPFLAGS -qthreaded" +- tmp_CPPFLAGS="$tmp_CPPFLAGS -qnoansialias" +- tmp_CPPFLAGS="$tmp_CPPFLAGS -qhalt=e" +- ;; +- # +- INTEL_UNIX_C) +- # +- tmp_CFLAGS="$tmp_CFLAGS -std=gnu89" +- tmp_CPPFLAGS="$tmp_CPPFLAGS -we140,147,165,266" +- tmp_CPPFLAGS="$tmp_CPPFLAGS -wd279,981,1469" +- ;; +- # +- INTEL_WINDOWS_C) +- # +- tmp_CFLAGS="$tmp_CFLAGS" +- ;; +- # +- LCC) +- # +- tmp_CFLAGS="$tmp_CFLAGS -n" +- ;; +- # +- SGI_MIPS_C) +- # +- tmp_CFLAGS="$tmp_CFLAGS" +- ;; +- # +- SGI_MIPSPRO_C) +- # +- tmp_CFLAGS="$tmp_CFLAGS" +- ;; +- # +- SUNPRO_C) +- # +- tmp_CFLAGS="$tmp_CFLAGS" +- ;; +- # +- TINY_C) +- # +- tmp_CFLAGS="$tmp_CFLAGS" +- ;; +- # +- esac +- # +- squeeze tmp_CPPFLAGS +- squeeze tmp_CFLAGS +- # +- if test ! -z "$tmp_CFLAGS" || test ! -z "$tmp_CPPFLAGS"; then +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compiler accepts some basic options" >&5 +-printf %s "checking if compiler accepts some basic options... " >&6; } +- CPPFLAGS="$tmp_save_CPPFLAGS $tmp_CPPFLAGS" +- CFLAGS="$tmp_save_CFLAGS $tmp_CFLAGS" +- squeeze CPPFLAGS +- squeeze CFLAGS +- +- tmp_compiler_works="unknown" +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +- +-int main (void) +-{ +- +- int i = 1; +- return i; +- +- ; +- return 0; +-} +- +-_ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : +- +- tmp_compiler_works="yes" +- +-else $as_nop +- +- tmp_compiler_works="no" +- echo " " >&6 +- sed 's/^/cc-fail: /' conftest.err >&6 +- echo " " >&6 +- +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +- if test "$tmp_compiler_works" = "yes"; then +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +- +-int main (void) +-{ +- +- int i = 1; +- return i; +- +- ; +- return 0; +-} +- +-_ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : +- +- tmp_compiler_works="yes" +- +-else $as_nop +- +- tmp_compiler_works="no" +- echo " " >&6 +- sed 's/^/link-fail: /' conftest.err >&6 +- echo " " >&6 +- +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.beam \ +- conftest$ac_exeext conftest.$ac_ext +- fi +- if test "x$cross_compiling" != "xyes" && +- test "$tmp_compiler_works" = "yes"; then +- +- case $host_os in +- darwin*) +- if test "$cross_compiling" = yes +-then : +- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "cannot run test program while cross compiling +-See \`config.log' for more details" "$LINENO" 5; } +-else $as_nop +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +-# ifdef __STDC__ +-# include <stdlib.h> +-# endif +- +-int main (void) +-{ +- +- int i = 0; +- exit(i); +- +- ; +- return 0; +-} +- +-_ACEOF +-if ac_fn_c_try_run "$LINENO" +-then : +- tmp_compiler_works="yes" +- +-else $as_nop +- tmp_compiler_works="no" +- echo " " >&6 +- echo "run-fail: test program exited with status $ac_status" >&6 +- echo " " >&6 +- +-fi +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +- conftest.$ac_objext conftest.beam conftest.$ac_ext +-fi +- +- ;; +- *) +- old=$LD_LIBRARY_PATH +- LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old +- export LD_LIBRARY_PATH +- if test "$cross_compiling" = yes +-then : +- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "cannot run test program while cross compiling +-See \`config.log' for more details" "$LINENO" 5; } +-else $as_nop +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +-# ifdef __STDC__ +-# include <stdlib.h> +-# endif +- +-int main (void) +-{ +- +- int i = 0; +- exit(i); +- +- ; +- return 0; +-} +- +-_ACEOF +-if ac_fn_c_try_run "$LINENO" +-then : +- tmp_compiler_works="yes" +- +-else $as_nop +- tmp_compiler_works="no" +- echo " " >&6 +- echo "run-fail: test program exited with status $ac_status" >&6 +- echo " " >&6 +- +-fi +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +- conftest.$ac_objext conftest.beam conftest.$ac_ext +-fi +- +- LD_LIBRARY_PATH=$old # restore +- ;; +- esac +- +- fi +- if test "$tmp_compiler_works" = "yes"; then +- +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-printf "%s\n" "yes" >&6; } +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: compiler options added: $tmp_CFLAGS $tmp_CPPFLAGS" >&5 +-printf "%s\n" "$as_me: compiler options added: $tmp_CFLAGS $tmp_CPPFLAGS" >&6;} +- +- else +- +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: compiler options rejected: $tmp_CFLAGS $tmp_CPPFLAGS" >&5 +-printf "%s\n" "$as_me: WARNING: compiler options rejected: $tmp_CFLAGS $tmp_CPPFLAGS" >&2;} +- CPPFLAGS="$tmp_save_CPPFLAGS" +- CFLAGS="$tmp_save_CFLAGS" +- +- fi +- +- fi +- # +- fi +- +- +- # +- if test "$compiler_id" != "unknown"; then +- # +- tmp_save_CFLAGS="$CFLAGS" +- tmp_save_CPPFLAGS="$CPPFLAGS" +- # +- tmp_options="" +- tmp_CFLAGS="$CFLAGS" +- tmp_CPPFLAGS="$CPPFLAGS" +- # +- if test "$want_debug" = "yes"; then +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compiler accepts debug enabling options" >&5 +-printf %s "checking if compiler accepts debug enabling options... " >&6; } +- tmp_options="$flags_dbg_yes" +- fi +- # +- if test "$flags_prefer_cppflags" = "yes"; then +- CPPFLAGS="$tmp_CPPFLAGS $tmp_options" +- CFLAGS="$tmp_CFLAGS" +- else +- CPPFLAGS="$tmp_CPPFLAGS" +- CFLAGS="$tmp_CFLAGS $tmp_options" +- fi +- squeeze CPPFLAGS +- squeeze CFLAGS +- fi +- +- +- # +- if test "$compiler_id" != "unknown"; then +- # +- tmp_save_CFLAGS="$CFLAGS" +- tmp_save_CPPFLAGS="$CPPFLAGS" +- # +- tmp_options="" +- tmp_CFLAGS="$CFLAGS" +- tmp_CPPFLAGS="$CPPFLAGS" +- honor_optimize_option="yes" +- # +- # +- if test "$want_optimize" = "assume_no" || +- test "$want_optimize" = "assume_yes"; then +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compiler optimizer assumed setting might be used" >&5 +-printf %s "checking if compiler optimizer assumed setting might be used... " >&6; } +- +- +- ac_var_match_word="no" +- for word1 in $tmp_CFLAGS; do +- for word2 in $flags_opt_all; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "yes"; then +- +- honor_optimize_option="no" +- +- +- fi +- +- +- +- ac_var_match_word="no" +- for word1 in $tmp_CPPFLAGS; do +- for word2 in $flags_opt_all; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "yes"; then +- +- honor_optimize_option="no" +- +- +- fi +- +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $honor_optimize_option" >&5 +-printf "%s\n" "$honor_optimize_option" >&6; } +- if test "$honor_optimize_option" = "yes"; then +- if test "$want_optimize" = "assume_yes"; then +- want_optimize="yes" +- fi +- if test "$want_optimize" = "assume_no"; then +- want_optimize="no" +- fi +- fi +- fi +- # +- if test "$honor_optimize_option" = "yes"; then +- +- ac_var_stripped="" +- for word1 in $tmp_CFLAGS; do +- ac_var_strip_word="no" +- for word2 in $flags_opt_all; do +- if test "$word1" = "$word2"; then +- ac_var_strip_word="yes" +- fi +- done +- if test "$ac_var_strip_word" = "no"; then +- ac_var_stripped="$ac_var_stripped $word1" +- fi +- done +- tmp_CFLAGS="$ac_var_stripped" +- squeeze tmp_CFLAGS +- +- +- ac_var_stripped="" +- for word1 in $tmp_CPPFLAGS; do +- ac_var_strip_word="no" +- for word2 in $flags_opt_all; do +- if test "$word1" = "$word2"; then +- ac_var_strip_word="yes" +- fi +- done +- if test "$ac_var_strip_word" = "no"; then +- ac_var_stripped="$ac_var_stripped $word1" +- fi +- done +- tmp_CPPFLAGS="$ac_var_stripped" +- squeeze tmp_CPPFLAGS +- +- if test "$want_optimize" = "yes"; then +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compiler accepts optimizer enabling options" >&5 +-printf %s "checking if compiler accepts optimizer enabling options... " >&6; } +- tmp_options="$flags_opt_yes" +- fi +- if test "$want_optimize" = "no"; then +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compiler accepts optimizer disabling options" >&5 +-printf %s "checking if compiler accepts optimizer disabling options... " >&6; } +- tmp_options="$flags_opt_off" +- fi +- if test "$flags_prefer_cppflags" = "yes"; then +- CPPFLAGS="$tmp_CPPFLAGS $tmp_options" +- CFLAGS="$tmp_CFLAGS" +- else +- CPPFLAGS="$tmp_CPPFLAGS" +- CFLAGS="$tmp_CFLAGS $tmp_options" +- fi +- squeeze CPPFLAGS +- squeeze CFLAGS +- +- tmp_compiler_works="unknown" +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +- +-int main (void) +-{ +- +- int i = 1; +- return i; +- +- ; +- return 0; +-} +- +-_ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : +- +- tmp_compiler_works="yes" +- +-else $as_nop +- +- tmp_compiler_works="no" +- echo " " >&6 +- sed 's/^/cc-fail: /' conftest.err >&6 +- echo " " >&6 +- +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +- if test "$tmp_compiler_works" = "yes"; then +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +- +-int main (void) +-{ +- +- int i = 1; +- return i; +- +- ; +- return 0; +-} +- +-_ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : +- +- tmp_compiler_works="yes" +- +-else $as_nop +- +- tmp_compiler_works="no" +- echo " " >&6 +- sed 's/^/link-fail: /' conftest.err >&6 +- echo " " >&6 +- +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.beam \ +- conftest$ac_exeext conftest.$ac_ext +- fi +- if test "x$cross_compiling" != "xyes" && +- test "$tmp_compiler_works" = "yes"; then +- +- case $host_os in +- darwin*) +- if test "$cross_compiling" = yes +-then : +- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "cannot run test program while cross compiling +-See \`config.log' for more details" "$LINENO" 5; } +-else $as_nop +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +-# ifdef __STDC__ +-# include <stdlib.h> +-# endif +- +-int main (void) +-{ +- +- int i = 0; +- exit(i); +- +- ; +- return 0; +-} +- +-_ACEOF +-if ac_fn_c_try_run "$LINENO" +-then : +- tmp_compiler_works="yes" +- +-else $as_nop +- tmp_compiler_works="no" +- echo " " >&6 +- echo "run-fail: test program exited with status $ac_status" >&6 +- echo " " >&6 +- +-fi +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +- conftest.$ac_objext conftest.beam conftest.$ac_ext +-fi +- +- ;; +- *) +- old=$LD_LIBRARY_PATH +- LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old +- export LD_LIBRARY_PATH +- if test "$cross_compiling" = yes +-then : +- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "cannot run test program while cross compiling +-See \`config.log' for more details" "$LINENO" 5; } +-else $as_nop +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +-# ifdef __STDC__ +-# include <stdlib.h> +-# endif +- +-int main (void) +-{ +- +- int i = 0; +- exit(i); +- +- ; +- return 0; +-} +- +-_ACEOF +-if ac_fn_c_try_run "$LINENO" +-then : +- tmp_compiler_works="yes" +- +-else $as_nop +- tmp_compiler_works="no" +- echo " " >&6 +- echo "run-fail: test program exited with status $ac_status" >&6 +- echo " " >&6 +- +-fi +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +- conftest.$ac_objext conftest.beam conftest.$ac_ext +-fi +- +- LD_LIBRARY_PATH=$old # restore +- ;; +- esac +- +- fi +- if test "$tmp_compiler_works" = "yes"; then +- +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-printf "%s\n" "yes" >&6; } +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: compiler options added: $tmp_options" >&5 +-printf "%s\n" "$as_me: compiler options added: $tmp_options" >&6;} +- +- else +- +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: compiler options rejected: $tmp_options" >&5 +-printf "%s\n" "$as_me: WARNING: compiler options rejected: $tmp_options" >&2;} +- CPPFLAGS="$tmp_save_CPPFLAGS" +- CFLAGS="$tmp_save_CFLAGS" +- +- fi +- +- fi +- # +- fi +- +- +- # +- if test "$compiler_id" != "unknown"; then +- # +- tmp_save_CPPFLAGS="$CPPFLAGS" +- tmp_save_CFLAGS="$CFLAGS" +- tmp_CPPFLAGS="" +- tmp_CFLAGS="" +- # +- case "$compiler_id" in +- # +- CLANG) +- # +- if test "$want_warnings" = "yes"; then +- tmp_CFLAGS="$tmp_CFLAGS -pedantic" +- +- ac_var_added_warnings="" +- for warning in all extra; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- +- ac_var_added_warnings="" +- for warning in pointer-arith write-strings; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- +- ac_var_added_warnings="" +- for warning in shadow; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- +- ac_var_added_warnings="" +- for warning in inline nested-externs; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- +- ac_var_added_warnings="" +- for warning in missing-declarations; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- +- ac_var_added_warnings="" +- for warning in missing-prototypes; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- tmp_CFLAGS="$tmp_CFLAGS -Wno-long-long" +- +- ac_var_added_warnings="" +- for warning in float-equal; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- +- ac_var_added_warnings="" +- for warning in no-multichar sign-compare; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- +- ac_var_added_warnings="" +- for warning in undef; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- tmp_CFLAGS="$tmp_CFLAGS -Wno-format-nonliteral" +- +- ac_var_added_warnings="" +- for warning in endif-labels strict-prototypes; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- +- ac_var_added_warnings="" +- for warning in declaration-after-statement; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- +- ac_var_added_warnings="" +- for warning in cast-align; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- tmp_CFLAGS="$tmp_CFLAGS -Wno-system-headers" +- +- ac_var_added_warnings="" +- for warning in shorten-64-to-32; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- # +- if test "$compiler_num" -ge "101"; then +- +- ac_var_added_warnings="" +- for warning in unused; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- fi +- # +- if test "$compiler_num" -ge "208"; then +- +- ac_var_added_warnings="" +- for warning in vla; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- fi +- # +- if test "$compiler_num" -ge "209"; then +- +- ac_var_added_warnings="" +- for warning in shift-sign-overflow; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- fi +- # +- if test "$compiler_num" -ge "302"; then +- case $host_os in +- cygwin* | mingw*) +- ;; +- *) +- +- ac_var_added_warnings="" +- for warning in missing-variable-declarations; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- ;; +- esac +- fi +- # +- if test "$compiler_num" -ge "306"; then +- +- ac_var_added_warnings="" +- for warning in double-promotion; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- fi +- # +- if test "$compiler_num" -ge "309"; then +- +- ac_var_added_warnings="" +- for warning in comma; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- # avoid the varargs warning, fixed in 4.0 +- # https://bugs.llvm.org/show_bug.cgi?id=29140 +- if test "$compiler_num" -lt "400"; then +- tmp_CFLAGS="$tmp_CFLAGS -Wno-varargs" +- fi +- fi +- if test "$compiler_num" -ge "700"; then +- +- ac_var_added_warnings="" +- for warning in assign-enum; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- +- ac_var_added_warnings="" +- for warning in extra-semi-stmt; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- fi +- fi +- ;; +- # +- DEC_C) +- # +- if test "$want_warnings" = "yes"; then +- tmp_CFLAGS="$tmp_CFLAGS -msg_enable level3" +- fi +- ;; +- # +- GNU_C) +- # +- if test "$want_warnings" = "yes"; then +- # +- if test "x$cross_compiling" != "xyes" || +- test "$compiler_num" -ge "300"; then +- tmp_CFLAGS="$tmp_CFLAGS -pedantic" +- fi +- # +- +- ac_var_added_warnings="" +- for warning in all; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- tmp_CFLAGS="$tmp_CFLAGS -W" +- # +- if test "$compiler_num" -ge "104"; then +- +- ac_var_added_warnings="" +- for warning in pointer-arith write-strings; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- if test "x$cross_compiling" != "xyes" || +- test "$compiler_num" -ge "300"; then +- +- ac_var_added_warnings="" +- for warning in unused shadow; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- fi +- fi +- # +- if test "$compiler_num" -ge "207"; then +- +- ac_var_added_warnings="" +- for warning in inline nested-externs; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- if test "x$cross_compiling" != "xyes" || +- test "$compiler_num" -ge "300"; then +- +- ac_var_added_warnings="" +- for warning in missing-declarations; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- +- ac_var_added_warnings="" +- for warning in missing-prototypes; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- fi +- fi +- # +- if test "$compiler_num" -ge "295"; then +- tmp_CFLAGS="$tmp_CFLAGS -Wno-long-long" +- +- ac_var_added_warnings="" +- for warning in bad-function-cast; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- fi +- # +- if test "$compiler_num" -ge "296"; then +- +- ac_var_added_warnings="" +- for warning in float-equal; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- tmp_CFLAGS="$tmp_CFLAGS -Wno-multichar" +- +- ac_var_added_warnings="" +- for warning in sign-compare; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- +- ac_var_added_warnings="" +- for warning in undef; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- fi +- # +- if test "$compiler_num" -ge "297"; then +- tmp_CFLAGS="$tmp_CFLAGS -Wno-format-nonliteral" +- fi +- # +- if test "$compiler_num" -ge "300"; then +- tmp_CFLAGS="$tmp_CFLAGS" +- fi +- # +- if test "$compiler_num" -ge "303"; then +- +- ac_var_added_warnings="" +- for warning in endif-labels strict-prototypes; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- fi +- # +- if test "$compiler_num" -ge "304"; then +- +- ac_var_added_warnings="" +- for warning in declaration-after-statement; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- +- ac_var_added_warnings="" +- for warning in old-style-definition; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- fi +- # +- if test "$compiler_num" -ge "400"; then +- tmp_CFLAGS="$tmp_CFLAGS -Wstrict-aliasing=3" +- fi +- # +- if test "$compiler_num" -ge "402"; then +- +- ac_var_added_warnings="" +- for warning in cast-align; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- fi +- # +- if test "$compiler_num" -ge "403"; then +- +- ac_var_added_warnings="" +- for warning in type-limits old-style-declaration; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- +- ac_var_added_warnings="" +- for warning in missing-parameter-type empty-body; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- +- ac_var_added_warnings="" +- for warning in clobbered ignored-qualifiers; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- +- ac_var_added_warnings="" +- for warning in conversion; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- tmp_CFLAGS="$tmp_CFLAGS -Wno-sign-conversion" +- +- ac_var_added_warnings="" +- for warning in vla; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- tmp_CFLAGS="$tmp_CFLAGS -ftree-vrp" +- fi +- # +- if test "$compiler_num" -ge "405"; then +- if test "$curl_cv_have_def__WIN32" = "yes"; then +- tmp_CFLAGS="$tmp_CFLAGS -Wno-pedantic-ms-format" +- fi +- fi +- # +- if test "$compiler_num" -ge "406"; then +- +- ac_var_added_warnings="" +- for warning in double-promotion; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- fi +- # +- if test "$compiler_num" -ge "408"; then +- tmp_CFLAGS="$tmp_CFLAGS -Wformat=2" +- fi +- # +- if test "$compiler_num" -ge "500"; then +- tmp_CFLAGS="$tmp_CFLAGS -Warray-bounds=2" +- fi +- # +- if test "$compiler_num" -ge "600"; then +- +- ac_var_added_warnings="" +- for warning in shift-negative-value; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- tmp_CFLAGS="$tmp_CFLAGS -Wshift-overflow=2" +- +- ac_var_added_warnings="" +- for warning in null-dereference; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- tmp_CFLAGS="$tmp_CFLAGS -fdelete-null-pointer-checks" +- +- ac_var_added_warnings="" +- for warning in duplicated-cond; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- +- ac_var_added_warnings="" +- for warning in unused-const-variable; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- fi +- # +- if test "$compiler_num" -ge "700"; then +- +- ac_var_added_warnings="" +- for warning in duplicated-branches; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- +- ac_var_added_warnings="" +- for warning in restrict; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- +- ac_var_added_warnings="" +- for warning in alloc-zero; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- tmp_CFLAGS="$tmp_CFLAGS -Wformat-overflow=2" +- tmp_CFLAGS="$tmp_CFLAGS -Wformat-truncation=2" +- if test "$compiler_num" -lt "1200"; then +- tmp_CFLAGS="$tmp_CFLAGS -Wimplicit-fallthrough=4" +- fi +- fi +- # +- if test "$compiler_num" -ge "1000"; then +- +- ac_var_added_warnings="" +- for warning in arith-conversion; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- +- ac_var_added_warnings="" +- for warning in enum-conversion; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- fi +- # +- fi +- # +- if test "$compiler_num" -ge "300"; then +- tmp_CFLAGS="$tmp_CFLAGS -Wno-system-headers" +- else +- if test "x$cross_compiling" = "xyes"; then +- if test "$compiler_num" -ge "104"; then +- tmp_CFLAGS="$tmp_CFLAGS -Wno-unused -Wno-shadow" +- fi +- if test "$compiler_num" -ge "207"; then +- tmp_CFLAGS="$tmp_CFLAGS -Wno-missing-declarations" +- tmp_CFLAGS="$tmp_CFLAGS -Wno-missing-prototypes" +- fi +- fi +- fi +- ;; +- # +- HP_UX_C) +- # +- if test "$want_warnings" = "yes"; then +- tmp_CFLAGS="$tmp_CFLAGS +w1" +- fi +- ;; +- # +- IBM_C) +- # +- tmp_CFLAGS="$tmp_CFLAGS" +- ;; +- # +- INTEL_UNIX_C) +- # +- if test "$want_warnings" = "yes"; then +- if test "$compiler_num" -gt "600"; then +- tmp_CPPFLAGS="$tmp_CPPFLAGS -Wall -w2" +- tmp_CPPFLAGS="$tmp_CPPFLAGS -Wcheck" +- tmp_CPPFLAGS="$tmp_CPPFLAGS -Wcomment" +- tmp_CPPFLAGS="$tmp_CPPFLAGS -Wdeprecated" +- tmp_CPPFLAGS="$tmp_CPPFLAGS -Wmissing-prototypes" +- tmp_CPPFLAGS="$tmp_CPPFLAGS -Wp64" +- tmp_CPPFLAGS="$tmp_CPPFLAGS -Wpointer-arith" +- tmp_CPPFLAGS="$tmp_CPPFLAGS -Wreturn-type" +- tmp_CPPFLAGS="$tmp_CPPFLAGS -Wshadow" +- tmp_CPPFLAGS="$tmp_CPPFLAGS -Wuninitialized" +- tmp_CPPFLAGS="$tmp_CPPFLAGS -Wunused-function" +- fi +- fi +- tmp_CFLAGS="$tmp_CFLAGS -fno-omit-frame-pointer" +- tmp_CFLAGS="$tmp_CFLAGS -fno-strict-aliasing" +- tmp_CFLAGS="$tmp_CFLAGS -fp-model precise" +- ;; +- # +- INTEL_WINDOWS_C) +- # +- tmp_CFLAGS="$tmp_CFLAGS" +- ;; +- # +- LCC) +- # +- if test "$want_warnings" = "yes"; then +- tmp_CFLAGS="$tmp_CFLAGS" +- fi +- ;; +- # +- SGI_MIPS_C) +- # +- if test "$want_warnings" = "yes"; then +- tmp_CFLAGS="$tmp_CFLAGS -fullwarn" +- fi +- ;; +- # +- SGI_MIPSPRO_C) +- # +- if test "$want_warnings" = "yes"; then +- tmp_CFLAGS="$tmp_CFLAGS -fullwarn" +- tmp_CFLAGS="$tmp_CFLAGS -woff 1209" +- fi +- ;; +- # +- SUNPRO_C) +- # +- if test "$want_warnings" = "yes"; then +- tmp_CFLAGS="$tmp_CFLAGS -v" +- fi +- ;; +- # +- TINY_C) +- # +- if test "$want_warnings" = "yes"; then +- +- ac_var_added_warnings="" +- for warning in all; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- +- ac_var_added_warnings="" +- for warning in write-strings; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- +- ac_var_added_warnings="" +- for warning in unsupported; do +- +- ac_var_match_word="no" +- for word1 in $CFLAGS; do +- for word2 in -Wno-$warning -W$warning; do +- if test "$word1" = "$word2"; then +- ac_var_match_word="yes" +- fi +- done +- done +- +- if test "$ac_var_match_word" = "no"; then +- ac_var_added_warnings="$ac_var_added_warnings -W$warning" +- fi +- done +- tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" +- squeeze tmp_CFLAGS +- +- fi +- ;; +- # +- esac +- # +- squeeze tmp_CPPFLAGS +- squeeze tmp_CFLAGS +- # +- if test ! -z "$tmp_CFLAGS" || test ! -z "$tmp_CPPFLAGS"; then +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compiler accepts strict warning options" >&5 +-printf %s "checking if compiler accepts strict warning options... " >&6; } +- CPPFLAGS="$tmp_save_CPPFLAGS $tmp_CPPFLAGS" +- CFLAGS="$tmp_save_CFLAGS $tmp_CFLAGS" +- squeeze CPPFLAGS +- squeeze CFLAGS +- +- tmp_compiler_works="unknown" +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +- +-int main (void) +-{ +- +- int i = 1; +- return i; +- +- ; +- return 0; +-} +- +-_ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : +- +- tmp_compiler_works="yes" +- +-else $as_nop +- +- tmp_compiler_works="no" +- echo " " >&6 +- sed 's/^/cc-fail: /' conftest.err >&6 +- echo " " >&6 +- +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +- if test "$tmp_compiler_works" = "yes"; then +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +- +-int main (void) +-{ +- +- int i = 1; +- return i; +- +- ; +- return 0; +-} +- +-_ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : +- +- tmp_compiler_works="yes" +- +-else $as_nop +- +- tmp_compiler_works="no" +- echo " " >&6 +- sed 's/^/link-fail: /' conftest.err >&6 +- echo " " >&6 +- +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.beam \ +- conftest$ac_exeext conftest.$ac_ext +- fi +- if test "x$cross_compiling" != "xyes" && +- test "$tmp_compiler_works" = "yes"; then +- +- case $host_os in +- darwin*) +- if test "$cross_compiling" = yes +-then : +- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "cannot run test program while cross compiling +-See \`config.log' for more details" "$LINENO" 5; } +-else $as_nop +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +-# ifdef __STDC__ +-# include <stdlib.h> +-# endif +- +-int main (void) +-{ +- +- int i = 0; +- exit(i); +- +- ; +- return 0; +-} +- +-_ACEOF +-if ac_fn_c_try_run "$LINENO" +-then : +- tmp_compiler_works="yes" +- +-else $as_nop +- tmp_compiler_works="no" +- echo " " >&6 +- echo "run-fail: test program exited with status $ac_status" >&6 +- echo " " >&6 +- +-fi +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +- conftest.$ac_objext conftest.beam conftest.$ac_ext +-fi +- +- ;; +- *) +- old=$LD_LIBRARY_PATH +- LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old +- export LD_LIBRARY_PATH +- if test "$cross_compiling" = yes +-then : +- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "cannot run test program while cross compiling +-See \`config.log' for more details" "$LINENO" 5; } +-else $as_nop +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +-# ifdef __STDC__ +-# include <stdlib.h> +-# endif +- +-int main (void) +-{ +- +- int i = 0; +- exit(i); +- +- ; +- return 0; +-} +- +-_ACEOF +-if ac_fn_c_try_run "$LINENO" +-then : +- tmp_compiler_works="yes" +- +-else $as_nop +- tmp_compiler_works="no" +- echo " " >&6 +- echo "run-fail: test program exited with status $ac_status" >&6 +- echo " " >&6 +- +-fi +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +- conftest.$ac_objext conftest.beam conftest.$ac_ext +-fi +- +- LD_LIBRARY_PATH=$old # restore +- ;; +- esac +- +- fi +- if test "$tmp_compiler_works" = "yes"; then +- +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-printf "%s\n" "yes" >&6; } +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: compiler options added: $tmp_CFLAGS $tmp_CPPFLAGS" >&5 +-printf "%s\n" "$as_me: compiler options added: $tmp_CFLAGS $tmp_CPPFLAGS" >&6;} +- +- else +- +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: compiler options rejected: $tmp_CFLAGS $tmp_CPPFLAGS" >&5 +-printf "%s\n" "$as_me: WARNING: compiler options rejected: $tmp_CFLAGS $tmp_CPPFLAGS" >&2;} +- CPPFLAGS="$tmp_save_CPPFLAGS" +- CFLAGS="$tmp_save_CFLAGS" +- +- fi +- +- fi +- # +- fi +- +- +-if test "$compiler_id" = "INTEL_UNIX_C"; then +- # +- if test "$compiler_num" -ge "1000"; then +- CFLAGS="$CFLAGS -shared-intel" +- elif test "$compiler_num" -ge "900"; then +- CFLAGS="$CFLAGS -i-dynamic" +- fi +- # +-fi +- +-CURL_CFLAG_EXTRAS="" +-if test X"$want_werror" = Xyes; then +- CURL_CFLAG_EXTRAS="-Werror" +- if test "$compiler_id" = "GNU_C"; then +- if test "$compiler_num" -ge "500"; then +- CURL_CFLAG_EXTRAS="$CURL_CFLAG_EXTRAS -pedantic-errors" +- fi +- fi +-fi +- +- +- + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compiler halts on compilation errors" >&5 + printf %s "checking if compiler halts on compilation errors... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +--- curl-7.83.1/curl-config.in.orig 2022-05-09 09:52:19.000000000 +0200 ++++ curl-7.83.1/curl-config.in 2022-05-11 16:28:11.191258534 +0200 +@@ -155,11 +155,7 @@ + ;; + + --libs) +- if test "X@libdir@" != "X/usr/lib" -a "X@libdir@" != "X/usr/lib64"; then +- CURLLIBDIR="-L@libdir@ " +- else +- CURLLIBDIR="" +- fi ++ CURLLIBDIR="" + if test "X@ENABLE_SHARED@" = "Xno"; then + echo ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@ + else +--- curl-7.83.1/src/Makefile.in.orig 2022-05-09 11:03:44.000000000 +0200 ++++ curl-7.83.1/src/Makefile.in 2022-05-12 17:27:11.606680950 +0200 +@@ -260,9 +260,9 @@ + am_curl_OBJECTS = $(am__objects_8) + curl_OBJECTS = $(am_curl_OBJECTS) + @USE_EXPLICIT_LIB_DEPS_FALSE@curl_DEPENDENCIES = \ +-@USE_EXPLICIT_LIB_DEPS_FALSE@ $(top_builddir)/lib/libcurl.la ++@USE_EXPLICIT_LIB_DEPS_FALSE@ $(top_builddir)/lib/.libs/libcurl.a + @USE_EXPLICIT_LIB_DEPS_TRUE@curl_DEPENDENCIES = \ +-@USE_EXPLICIT_LIB_DEPS_TRUE@ $(top_builddir)/lib/libcurl.la ++@USE_EXPLICIT_LIB_DEPS_TRUE@ $(top_builddir)/lib/.libs/libcurl.a + AM_V_P = $(am__v_P_@AM_V@) + am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) + am__v_P_0 = false +@@ -814,8 +814,8 @@ + + # CURL_FILES comes from Makefile.inc + curl_SOURCES = $(CURL_FILES) +-@USE_EXPLICIT_LIB_DEPS_FALSE@curl_LDADD = $(top_builddir)/lib/libcurl.la @NSS_LIBS@ @SSL_LIBS@ @ZLIB_LIBS@ @CURL_NETWORK_AND_TIME_LIBS@ +-@USE_EXPLICIT_LIB_DEPS_TRUE@curl_LDADD = $(top_builddir)/lib/libcurl.la @LIBCURL_LIBS@ ++@USE_EXPLICIT_LIB_DEPS_FALSE@curl_LDADD = $(top_builddir)/lib/.libs/libcurl.a @NSS_LIBS@ @SSL_LIBS@ @ZLIB_LIBS@ @CURL_NETWORK_AND_TIME_LIBS@ ++@USE_EXPLICIT_LIB_DEPS_TRUE@curl_LDADD = $(top_builddir)/lib/.libs/libcurl.a @LIBCURL_LIBS@ + + # if unit tests are enabled, build a static library to link them with + @BUILD_UNITTESTS_TRUE@noinst_LTLIBRARIES = libcurltool.la |