diff options
author | Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2021-07-22 05:12:52 +0800 |
---|---|---|
committer | Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2021-07-22 05:12:52 +0800 |
commit | ee05a0fbe5a5835ca262c01f28de2f050c0d0da1 (patch) | |
tree | 589b5682961657065b1c61b6b672836e8700a24f /ftp/curl/files/patch-configure | |
parent | dns/libidn2: Update to 2.3.2 (diff) |
ftp/curl: Update to 7.78.0
- Remove METALINK option: all support removed by upstream
- Update NTLM option: it has own configure option now
Changes: https://curl.se/changes.html
Diffstat (limited to 'ftp/curl/files/patch-configure')
-rw-r--r-- | ftp/curl/files/patch-configure | 43 |
1 files changed, 9 insertions, 34 deletions
diff --git a/ftp/curl/files/patch-configure b/ftp/curl/files/patch-configure index 540198a050c2..13c8672eb654 100644 --- a/ftp/curl/files/patch-configure +++ b/ftp/curl/files/patch-configure @@ -1,14 +1,6 @@ -Description: Tweak the build for a FreeBSD environment. - Respect user-supplied CFLAGS - Use the FreeBSD location of pkg-config's library directory. - Check for librtmp in sensible locations in all cases. -Forwarded: not-needed -Author: Peter Pentchev <roam@FreeBSD.org> -Last-Update: 2010-12-19 - ---- configure.orig 2019-02-05 14:11:44 UTC +--- configure.orig 2021-07-19 12:47:17 UTC +++ configure -@@ -3637,9 +3637,10 @@ $as_echo "$as_me: LIBS note: LIBS should +@@ -3738,9 +3738,10 @@ $as_echo "$as_me: LIBS note: LIBS should only be used -I*) xc_bad_var_ldflags=yes ;; @@ -22,7 +14,7 @@ Last-Update: 2010-12-19 esac done if test $xc_bad_var_ldflags = yes; then -@@ -3709,9 +3710,10 @@ $as_echo "$as_me: $xc_bad_var_msg librar +@@ -3810,9 +3811,10 @@ $as_echo "$as_me: $xc_bad_var_msg libraries. Use LIBS xc_bad_var_cflags=no for xc_word in $CFLAGS; do case "$xc_word" in @@ -36,33 +28,16 @@ Last-Update: 2010-12-19 -U*) xc_bad_var_cflags=yes ;; -@@ -17193,6 +17195,8 @@ $as_echo "$as_me: WARNING: compiler opti - tmp_CFLAGS="$CFLAGS" - tmp_CPPFLAGS="$CPPFLAGS" - -+# Do not remove the user-supplied debug flags in CFLAGS (PR/150854) -+if false; then - ac_var_stripped="" - for word1 in $tmp_CFLAGS; do - ac_var_strip_word="no" -@@ -17223,6 +17227,7 @@ $as_echo "$as_me: WARNING: compiler opti - done - tmp_CPPFLAGS="$ac_var_stripped" - squeeze tmp_CPPFLAGS -+fi - - # - if test "$want_debug" = "yes"; then -@@ -17445,6 +17450,8 @@ $as_echo "$honor_optimize_option" >&6; } +@@ -17213,6 +17215,8 @@ $as_echo "$honor_optimize_option" >&6; } # if test "$honor_optimize_option" = "yes"; then -+# Do not remove the user-supplied optimization flags in CFLAGS (PR/150854) ++# Do not remove the user-supplied optimization flags in CFLAGS/CPPFLAGS (PR/150854) +if false; then ac_var_stripped="" for word1 in $tmp_CFLAGS; do ac_var_strip_word="no" -@@ -17475,6 +17482,7 @@ $as_echo "$honor_optimize_option" >&6; } +@@ -17243,6 +17247,7 @@ $as_echo "$honor_optimize_option" >&6; } done tmp_CPPFLAGS="$ac_var_stripped" squeeze tmp_CPPFLAGS @@ -70,7 +45,7 @@ Last-Update: 2010-12-19 if test "$want_optimize" = "yes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts optimizer enabling options" >&5 -@@ -26706,30 +26714,30 @@ $as_echo "found" >&6; } +@@ -28147,30 +28152,30 @@ $as_echo "found" >&6; } ;; off) LIB_RTMP="-lrtmp" @@ -110,7 +85,7 @@ Last-Update: 2010-12-19 cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -41169,9 +41177,10 @@ $as_echo "$as_me: LIBS note: LIBS should +@@ -43354,9 +43359,10 @@ $as_echo "$as_me: LIBS note: LIBS should only be used -I*) xc_bad_var_ldflags=yes ;; @@ -124,7 +99,7 @@ Last-Update: 2010-12-19 esac done if test $xc_bad_var_ldflags = yes; then -@@ -41241,9 +41250,10 @@ $as_echo "$as_me: $xc_bad_var_msg librar +@@ -43426,9 +43432,10 @@ $as_echo "$as_me: $xc_bad_var_msg libraries. Use LIBS xc_bad_var_cflags=no for xc_word in $CFLAGS; do case "$xc_word" in |