mirror of
https://git.freebsd.org/ports.git
synced 2025-07-02 01:50:37 -04:00
a9da0a91c9
Changes: https://curl.haxx.se/changes.html Security: 9314058e-5204-11e7-b712-b1a44a034d72 MFH: 2017Q2
140 lines
4 KiB
Text
140 lines
4 KiB
Text
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 2017-06-14 06:10:57 UTC
|
|
+++ configure
|
|
@@ -4149,9 +4149,10 @@ $as_echo "$as_me: LIBS note: LIBS should
|
|
-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
|
|
@@ -4221,9 +4222,10 @@ $as_echo "$as_me: $xc_bad_var_msg librar
|
|
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
|
|
;;
|
|
@@ -17982,6 +17984,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"
|
|
@@ -18012,6 +18016,7 @@ $as_echo "$as_me: WARNING: compiler opti
|
|
done
|
|
tmp_CPPFLAGS="$ac_var_stripped"
|
|
squeeze tmp_CPPFLAGS
|
|
+fi
|
|
|
|
#
|
|
if test "$want_debug" = "yes"; then
|
|
@@ -18229,6 +18234,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)
|
|
+if false; then
|
|
ac_var_stripped=""
|
|
for word1 in $tmp_CFLAGS; do
|
|
ac_var_strip_word="no"
|
|
@@ -18259,6 +18266,7 @@ $as_echo "$honor_optimize_option" >&6; }
|
|
done
|
|
tmp_CPPFLAGS="$ac_var_stripped"
|
|
squeeze tmp_CPPFLAGS
|
|
+fi
|
|
|
|
if test "$want_optimize" = "yes"; then
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts optimizer enabling options" >&5
|
|
@@ -26661,30 +26669,30 @@ $as_echo "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"
|
|
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RTMP_Init in -lrtmp" >&5
|
|
-$as_echo_n "checking for RTMP_Init in -lrtmp... " >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RTMP_Init in $LIB_RTMP" >&5
|
|
+$as_echo_n "checking for RTMP_Init in $LIB_RTMP... " >&6; }
|
|
if ${ac_cv_lib_rtmp_RTMP_Init+:} false; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lrtmp $LIBS"
|
|
+LIBS="$LIBS"
|
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
@@ -41279,9 +41287,10 @@ $as_echo "$as_me: LIBS note: LIBS should
|
|
-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
|
|
@@ -41351,9 +41360,10 @@ $as_echo "$as_me: $xc_bad_var_msg librar
|
|
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
|
|
;;
|