ports/math/R/files/patch-configure
Wen Heping f7139079e1 - Update to 3.2.2
PR:		203418
Submitted by:	wen@(myself)
Reviewed by:	tota@
Approved by:	maintainer(timeout, > 25 days)
Thanks to:	freebsd-bugs@mackler.org harrison.grundy@astrodoggroup.com
2015-10-27 08:21:25 +00:00

113 lines
3.5 KiB
Text

--- configure.orig 2015-08-13 09:21:16 UTC
+++ configure
@@ -20589,13 +20589,13 @@ if test "x$ac_cv_lib_mw__mwvalidcheckl"
LIBM="-lmw"
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
-$as_echo_n "checking for cos in -lm... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lquadmath -lm" >&5
+$as_echo_n "checking for cos in -lquadmath -lm... " >&6; }
if ${ac_cv_lib_m_cos+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lm $LIBS"
+LIBS="-lquadmath -lm $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -20626,18 +20626,18 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
$as_echo "$ac_cv_lib_m_cos" >&6; }
if test "x$ac_cv_lib_m_cos" = xyes; then :
- LIBM="$LIBM -lm"
+ LIBM="$LIBM -lquadmath -lm"
fi
;;
*)
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
-$as_echo_n "checking for cos in -lm... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lquadmath -lm" >&5
+$as_echo_n "checking for cos in -lquadmath -lm... " >&6; }
if ${ac_cv_lib_m_cos+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lm $LIBS"
+LIBS="-lquadmath -lm $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -20668,7 +20668,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
$as_echo "$ac_cv_lib_m_cos" >&6; }
if test "x$ac_cv_lib_m_cos" = xyes; then :
- LIBM="-lm"
+ LIBM="-lquadmath -lm"
fi
;;
@@ -20679,13 +20679,13 @@ esac
## </NOTE>
## AC_CHECK_LIBM computes LIBM but does not add to LIBS, hence we do
## the following as well.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sin in -lm" >&5
-$as_echo_n "checking for sin in -lm... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sin in -lquadmath -lm" >&5
+$as_echo_n "checking for sin in -lquadmath -lm... " >&6; }
if ${ac_cv_lib_m_sin+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lm $LIBS"
+LIBS="-lquadmath -lm $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -20720,7 +20720,7 @@ if test "x$ac_cv_lib_m_sin" = xyes; then
#define HAVE_LIBM 1
_ACEOF
- LIBS="-lm $LIBS"
+ LIBS="-lquadmath -lm $LIBS"
fi
@@ -26166,7 +26166,7 @@ fi
## if nothing was obtained for SHLIB_CXXLDFLAGS.
##
## Note also that some systems (formerly AIX) do not allow for unresolved
-## symbols at link time. For such systems, we link against -lm (in case
+## symbols at link time. For such systems, we link against -lquadmath -lm (in case
## it exists) when building a shlib module via SHLIB_LIBADD.
main_ld="${CC}"
@@ -28310,7 +28310,7 @@ if ${ac_cv_lib_rt_clock_gettime+:} false
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lrt $LIBS"
+LIBS=" $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -28353,7 +28353,7 @@ if test "x$ac_cv_lib_rt_clock_gettime" =
#define HAVE_LIBRT 1
_ACEOF
- LIBS="-lrt $LIBS"
+ LIBS="$LIBS"
fi
@@ -33267,7 +33267,7 @@ fi
## Part 2. Try finding the tk library.
if test -n "${TK_CONFIG}"; then
. ${TK_CONFIG}
- TCLTK_LIBS="${TCLTK_LIBS} ${TK_LIB_SPEC} ${TK_XLIBSW}"
+ TCLTK_LIBS="${TCLTK_LIBS} ${TK_LIB_SPEC} ${TK_XLIBSW} ${TCL_LD_FLAGS}"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tk_Init in -ltk" >&5
$as_echo_n "checking for Tk_Init in -ltk... " >&6; }