sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-06-30 00:50:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions
ports/ftp/curl/files/patch-configure
Po-Chuan Hsieh c312e7f6fc
ftp/curl: Convert REINPLACE_CMD to patch files
2023-04-09 21:36:35 +08:00

204 lines
6.1 KiB
Text
Raw Blame History

--- configure.orig 2023-03-20 11:39:06 UTC
+++ configure
@@ -4179,9 +4179,10 @@ printf "%s\n" "$as_me: LIBS note: LIBS should only be
-I*)
xc_bad_var_ldflags=yes
;;
- -l* | --library=*)
- xc_bad_var_ldflags=yes
- ;;
+# Temporarily disable -l* flag check for SSP support (Mk/bsd.ssp.mk)
+# -l* | --library=*)
+# xc_bad_var_ldflags=yes
+# ;;
esac
done
if test $xc_bad_var_ldflags = yes; then
@@ -4251,9 +4252,10 @@ printf "%s\n" "$as_me: $xc_bad_var_msg libraries. Use
xc_bad_var_cflags=no
for xc_word in $CFLAGS; do
case "$xc_word" in
- -D*)
- xc_bad_var_cflags=yes
- ;;
+# Temporarily disable -D* flag check (PR/177401, PR/180944)
+# -D*)
+# xc_bad_var_cflags=yes
+# ;;
-U*)
xc_bad_var_cflags=yes
;;
@@ -17387,7 +17389,7 @@ printf "%s\n" "$as_me: WARNING: failed to figure out c
flags_dbg_yes="unknown"
flags_opt_all="unknown"
flags_opt_yes="unknown"
- flags_opt_off="unknown"
+ flags_opt_off=""
#
flags_prefer_cppflags="no"
#
@@ -17492,7 +17494,7 @@ printf "%s\n" "yes" >&6; }
flags_dbg_yes="-g2"
flags_opt_all="-O -O0 -O1 -O2 -O3 -O4"
flags_opt_yes="-O1"
- flags_opt_off="-O0"
+ flags_opt_off=""
else
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
@@ -17553,7 +17555,7 @@ printf "%s\n" "yes" >&6; }
flags_dbg_yes="-g"
flags_opt_all="-O +O0 +O1 +O2 +O3 +O4"
flags_opt_yes="+O2"
- flags_opt_off="+O0"
+ flags_opt_off=""
else
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
@@ -17621,7 +17623,7 @@ printf "%s\n" "yes" >&6; }
flags_opt_all="$flags_opt_all -qoptimize=4"
flags_opt_all="$flags_opt_all -qoptimize=5"
flags_opt_yes="-O2"
- flags_opt_off="-qnooptimize"
+ flags_opt_off=""
flags_prefer_cppflags="yes"
else
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -17730,13 +17732,13 @@ rm -f conftest.err conftest.i conftest.$ac_ext
flags_dbg_yes="-g"
flags_opt_all="-O -O0 -O1 -O2 -O3 -Os"
flags_opt_yes="-O2"
- flags_opt_off="-O0"
+ flags_opt_off=""
else
compiler_id="INTEL_WINDOWS_C"
flags_dbg_yes="/Zi /Oy-"
flags_opt_all="/O /O0 /O1 /O2 /O3 /Od /Og /Og- /Oi /Oi-"
flags_opt_yes="/O2"
- flags_opt_off="/Od"
+ flags_opt_off=""
fi
else
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -17865,7 +17867,7 @@ printf "%s\n" "no" >&6; }
flags_dbg_yes="-g"
flags_opt_all="-O -O0 -O1 -O2 -Os -O3 -O4"
flags_opt_yes="-O2"
- flags_opt_off="-O0"
+ flags_opt_off=""
else
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
@@ -17931,7 +17933,7 @@ printf "%s\n" "yes" >&6; }
flags_dbg_yes="-g"
flags_opt_all="-O -O0 -O1 -O2 -O3 -Os -Og -Ofast"
flags_opt_yes="-O2"
- flags_opt_off="-O0"
+ flags_opt_off=""
OLDCPPFLAGS=$CPPFLAGS
# CPPPFLAG comes from CURL_CPP_P
@@ -18190,7 +18192,7 @@ printf "%s\n" "yes" >&6; }
flags_dbg_yes="-g"
flags_opt_all="-O -O0 -O1 -O2 -O3 -Ofast"
flags_opt_yes="-O2"
- flags_opt_off="-O0"
+ flags_opt_off=""
else
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
@@ -18298,7 +18300,7 @@ printf "%s\n" "yes" >&6; }
flags_dbg_yes="-g"
flags_opt_all="-O -O0 -O1 -O2 -O3 -Ofast"
flags_opt_yes="-O2"
- flags_opt_off="-O0"
+ flags_opt_off=""
else
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
@@ -18831,6 +18833,8 @@ printf "%s\n" "$honor_optimize_option" >&6; }
#
if test "$honor_optimize_option" = "yes"; then
+# 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"
@@ -18861,6 +18865,7 @@ printf "%s\n" "$honor_optimize_option" >&6; }
done
tmp_CPPFLAGS="$ac_var_stripped"
squeeze tmp_CPPFLAGS
+fi
if test "$want_optimize" = "yes"; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compiler accepts optimizer enabling options" >&5
@@ -29941,31 +29946,31 @@ printf "%s\n" "found" >&6; }
;;
off)
LIB_RTMP="-lrtmp"
+ LD_RTMP=""
+ CPP_RTMP=""
+ DIR_RTMP=""
;;
*)
LIB_RTMP="-lrtmp"
+ LD_RTMP="-L${PREFIX_RTMP}/lib$libsuff"
+ CPP_RTMP="-I${PREFIX_RTMP}/include"
+ DIR_RTMP="${PREFIX_RTMP}/lib$libsuff"
PREFIX_RTMP=$OPT_LIBRTMP
;;
esac
- if test -n "$PREFIX_RTMP"; then
- LD_RTMP=-L${PREFIX_RTMP}/lib$libsuff
- CPP_RTMP=-I${PREFIX_RTMP}/include
- DIR_RTMP=${PREFIX_RTMP}/lib$libsuff
- fi
-
LDFLAGS="$LDFLAGS $LD_RTMP"
CPPFLAGS="$CPPFLAGS $CPP_RTMP"
LIBS="$LIB_RTMP $LIBS"
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for RTMP_Init in -lrtmp" >&5
-printf %s "checking for RTMP_Init in -lrtmp... " >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for RTMP_Init in $LIB_RTMP" >&5
+printf %s "checking for RTMP_Init in $LIB_RTMP... " >&6; }
if test ${ac_cv_lib_rtmp_RTMP_Init+y}
then :
printf %s "(cached) " >&6
else $as_nop
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lrtmp $LIBS"
+LIBS="$LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -45632,9 +45637,10 @@ printf "%s\n" "$as_me: LIBS note: LIBS should only be
-I*)
xc_bad_var_ldflags=yes
;;
- -l* | --library=*)
- xc_bad_var_ldflags=yes
- ;;
+# Temporarily disable -l* flag check for SSP support (Mk/bsd.ssp.mk)
+# -l* | --library=*)
+# xc_bad_var_ldflags=yes
+# ;;
esac
done
if test $xc_bad_var_ldflags = yes; then
@@ -45704,9 +45710,10 @@ printf "%s\n" "$as_me: $xc_bad_var_msg libraries. Use
xc_bad_var_cflags=no
for xc_word in $CFLAGS; do
case "$xc_word" in
- -D*)
- xc_bad_var_cflags=yes
- ;;
+# Temporarily disable -D* flag check (PR/177401, PR/180944)
+# -D*)
+# xc_bad_var_cflags=yes
+# ;;
-U*)
xc_bad_var_cflags=yes
;;
Reference in a new issue View git blame Copy permalink