1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-03 06:04:53 +00:00
freebsd-ports/x11-toolkits/wxgtk30/files/patch-configure
John Marino 39048027d5 x11-toolkits/wxgtk30: Support c++11 over c++0x, plus DragonFly
The wxgtk30 port will use TR1 headers if the capability is detected.
These TR1 functions were experimental and not included in the same form
in the final c++11 standard.  This patch forcibly disabled TR1 support,
which requires the explicit setting of -std=c++11 in CXXFLAGS>

A private "exp-run" was performed, all 62 ports dependent on wxgtk2
successfully built before and after after the patch was applied on two
separate runs (FreeBSD 10 amd64 jail).

While here, remove the incorrect $PTHREAD_LIB setting and let it default
to -pthread.  Also bring in the configure patch fragement from DragonFly.

PR:		199177
Submitted by:	marino
Approved by:	maintainer (Chris Hutchinson)
2015-04-06 18:49:52 +00:00

55 lines
1.6 KiB
Plaintext

--- configure.orig 2014-10-06 21:33:44 UTC
+++ configure
@@ -3947,7 +3947,7 @@ case "${host}" in
DEFAULT_DEFAULT_wxUSE_MOTIF=1
;;
- *-*-freebsd*)
+ *-*-dragonfly*|*-*-freebsd*)
USE_BSD=1
USE_FREEBSD=1
$as_echo "#define __FREEBSD__ 1" >>confdefs.h
@@ -21894,6 +21894,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
SEARCH_INCLUDE="\
+ $X11BASE/include \
/usr/local/include \
/usr/local/X11/include \
/usr/local/include/X11 \
@@ -31852,9 +31853,6 @@ $as_echo "$as_me: WARNING: BeOS threads
THREAD_OPTS="-pthreads $THREAD_OPTS"
fi
;;
- *-*-freebsd*)
- THREAD_OPTS="-kthread lthread $THREAD_OPTS c_r"
- ;;
*-*-darwin* | *-*-cygwin* )
THREAD_OPTS=""
;;
@@ -33127,7 +33125,7 @@ else
fi
fi
fi
-
+OPTIMISE_CFLAGS=
if test "x$WXWIN_COMPATIBILITY_2_6" = "xyes"; then
$as_echo "#define WXWIN_COMPATIBILITY_2_6 1" >>confdefs.h
@@ -39390,6 +39388,7 @@ EOF
;;
powerpc-apple-macos* | \
+ *-*-dragonfly* | \
*-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-gnu* | *-*-k*bsd*-gnu | \
*-*-mirbsd* | \
*-*-sunos4* | \
@@ -39432,6 +39431,7 @@ EOF
case "${BAKEFILE_HOST}" in
*-*-linux* | *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
+ *-*-dragonfly* | \
*-*-k*bsd*-gnu | *-*-mirbsd* | *-*-gnu* )
if test "x$SUNCXX" = "xyes"; then
SONAME_FLAG="-h "