mirror of
https://git.freebsd.org/ports.git
synced 2025-06-22 21:20:31 -04:00
6387b07b2f
- disable the -Werror build option by popular demand - do not override the user's debug and optimization settings PR: 150854 (the debug and optimization CFLAGS) Reported by: Anonymous <swell.k@gmail.com>
109 lines
3.2 KiB
Text
109 lines
3.2 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
|
|
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -14201,10 +14201,10 @@
|
|
flags_dbg_all="$flags_dbg_all -gdwarf-2"
|
|
flags_dbg_all="$flags_dbg_all -gvms"
|
|
flags_dbg_yes="-g"
|
|
- flags_dbg_off="-g0"
|
|
+ flags_dbg_off=""
|
|
flags_opt_all="-O -O0 -O1 -O2 -O3 -Os"
|
|
flags_opt_yes="-O2"
|
|
- flags_opt_off="-O0"
|
|
+ flags_opt_off=""
|
|
else
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
$as_echo "no" >&6; }
|
|
@@ -15041,6 +15041,9 @@
|
|
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"
|
|
@@ -15071,6 +15074,7 @@
|
|
done
|
|
tmp_CPPFLAGS="$ac_var_stripped"
|
|
squeeze tmp_CPPFLAGS
|
|
+fi
|
|
|
|
#
|
|
if test "$want_debug" = "yes"; then
|
|
@@ -15283,6 +15287,9 @@
|
|
#
|
|
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"
|
|
@@ -15313,6 +15320,7 @@
|
|
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
|
|
@@ -19224,7 +19232,8 @@
|
|
PKGTEST="no"
|
|
PREFIX_OPENSSL=$OPT_SSL
|
|
|
|
- OPENSSL_PCDIR="$OPT_SSL/lib/pkgconfig"
|
|
+ # Use the FreeBSD location of the pkg-config libdir
|
|
+ OPENSSL_PCDIR="$LOCALBASE/libdata/pkgconfig"
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: PKG_CONFIG_LIBDIR will be set to \"$OPENSSL_PCDIR\"" >&5
|
|
$as_echo "$as_me: PKG_CONFIG_LIBDIR will be set to \"$OPENSSL_PCDIR\"" >&6;}
|
|
if test -e "$OPENSSL_PCDIR/openssl.pc"; then
|
|
@@ -21264,29 +21273,30 @@
|
|
;;
|
|
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="$LIBS $LIB_RTMP"
|
|
|
|
- { $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 test "${ac_cv_lib_rtmp_RTMP_Init+set}" = set; 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. */
|
|
|