mirror of
https://git.freebsd.org/ports.git
synced 2025-07-02 18:10:38 -04:00
b8e2378484
- Turn COOKIES on by default - Support STAGEDIR Note: - mk-ca-bundle.1 will not be installed. Use http://curl.haxx.se/docs/caextract.html instead Changes: http://curl.haxx.se/changes.html PR: ports/181510 Exp run by: drewery
122 lines
3.5 KiB
Text
122 lines
3.5 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 2013-06-22 06:29:35.000000000 +0800
|
|
+++ configure 2013-09-18 01:39:42.256041308 +0800
|
|
@@ -3626,9 +3626,10 @@
|
|
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
|
|
;;
|
|
@@ -16922,6 +16923,8 @@
|
|
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"
|
|
@@ -16952,6 +16955,7 @@
|
|
done
|
|
tmp_CPPFLAGS="$ac_var_stripped"
|
|
squeeze tmp_CPPFLAGS
|
|
+fi
|
|
|
|
#
|
|
if test "$want_debug" = "yes"; then
|
|
@@ -17169,6 +17173,8 @@
|
|
#
|
|
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"
|
|
@@ -17199,6 +17205,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
|
|
@@ -21624,7 +21631,8 @@
|
|
PKGTEST="no"
|
|
PREFIX_OPENSSL=$OPT_SSL
|
|
|
|
- OPENSSL_PCDIR="$OPT_SSL/lib/pkgconfig"
|
|
+ # Use the FreeBSD location of the pkgconf 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 -f "$OPENSSL_PCDIR/openssl.pc"; then
|
|
@@ -24972,29 +24980,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="$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. */
|
|
|
|
@@ -39266,9 +39275,10 @@
|
|
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
|
|
;;
|