1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
|
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 2013-10-12 20:24:48 UTC
+++ configure
@@ -3611,9 +3611,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
@@ -3683,9 +3684,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
;;
@@ -16960,6 +16962,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"
@@ -16990,6 +16994,7 @@ $as_echo "$as_me: WARNING: compiler opti
done
tmp_CPPFLAGS="$ac_var_stripped"
squeeze tmp_CPPFLAGS
+fi
#
if test "$want_debug" = "yes"; then
@@ -17207,6 +17212,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"
@@ -17237,6 +17244,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
@@ -25050,29 +25059,30 @@ $as_echo "found" >&6; }
;;
off)
LIB_RTMP="-lrtmp"
+ LD_RTMP=""
+ CPP_RTMP=""
+ DIR_RTMP=""
;;
*)
PREFIX_RTMP=$OPT_LIBRTMP
+ LIB_RTMP="-lrtmp"
+ LD_RTMP="-L${PREFIX_RTMP}/lib$libsuff"
+ CPP_RTMP="-I${PREFIX_RTMP}/include"
+ DIR_RTMP="${PREFIX_RTMP}/lib$libsuff"
;;
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. */
@@ -39613,9 +39623,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
@@ -39685,9 +39696,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
;;
|
