83 lines
3.0 KiB
Plaintext
83 lines
3.0 KiB
Plaintext
$OpenBSD: patch-gui-wx_configure_configure,v 1.4 2019/01/02 12:43:19 jca Exp $
|
|
|
|
Don't force -O2.
|
|
|
|
Index: gui-wx/configure/configure
|
|
--- gui-wx/configure/configure.orig
|
|
+++ gui-wx/configure/configure
|
|
@@ -3744,17 +3744,9 @@ $as_echo "$ac_cv_prog_cc_g" >&6; }
|
|
if test "$ac_test_CFLAGS" = set; then
|
|
CFLAGS=$ac_save_CFLAGS
|
|
elif test $ac_cv_prog_cc_g = yes; then
|
|
- if test "$GCC" = yes; then
|
|
- CFLAGS="-g -O2"
|
|
- else
|
|
- CFLAGS="-g"
|
|
- fi
|
|
+ CFLAGS="-g"
|
|
else
|
|
- if test "$GCC" = yes; then
|
|
- CFLAGS="-O2"
|
|
- else
|
|
- CFLAGS=
|
|
- fi
|
|
+ CFLAGS=
|
|
fi
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
|
|
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
|
|
@@ -4672,17 +4664,9 @@ $as_echo "$ac_cv_prog_cxx_g" >&6; }
|
|
if test "$ac_test_CXXFLAGS" = set; then
|
|
CXXFLAGS=$ac_save_CXXFLAGS
|
|
elif test $ac_cv_prog_cxx_g = yes; then
|
|
- if test "$GXX" = yes; then
|
|
- CXXFLAGS="-g -O2"
|
|
- else
|
|
- CXXFLAGS="-g"
|
|
- fi
|
|
+ CXXFLAGS="-g"
|
|
else
|
|
- if test "$GXX" = yes; then
|
|
- CXXFLAGS="-O2"
|
|
- else
|
|
- CXXFLAGS=
|
|
- fi
|
|
+ CXXFLAGS=
|
|
fi
|
|
ac_ext=c
|
|
ac_cpp='$CPP $CPPFLAGS'
|
|
@@ -5793,7 +5777,7 @@ $as_echo "will be automatically detected" >&6; }
|
|
else
|
|
TOOLKIT="$withval"
|
|
|
|
- if test "$TOOLKIT" != "gtk1" -a "$TOOLKIT" != "gtk2" -a \
|
|
+ if test "$TOOLKIT" != "gtk1" -a "$TOOLKIT" != "gtk2" -a "$TOOLKIT" != "gtk3" -a \
|
|
"$TOOLKIT" != "msw" -a "$TOOLKIT" != "motif" -a \
|
|
"$TOOLKIT" != "x11" -a "$TOOLKIT" != "mac" -a \
|
|
"$TOOLKIT" != "mgl" -a "$TOOLKIT" != "dfb" ; then
|
|
@@ -6268,6 +6252,7 @@ $as_echo_n "checking which wxWidgets toolkit was selec
|
|
|
|
WX_GTKPORT1=$(expr "$WX_SELECTEDCONFIG" : ".*gtk1.*")
|
|
WX_GTKPORT2=$(expr "$WX_SELECTEDCONFIG" : ".*gtk2.*")
|
|
+ WX_GTKPORT3=$(expr "$WX_SELECTEDCONFIG" : ".*gtk3.*")
|
|
WX_MSWPORT=$(expr "$WX_SELECTEDCONFIG" : ".*msw.*")
|
|
WX_MOTIFPORT=$(expr "$WX_SELECTEDCONFIG" : ".*motif.*")
|
|
WX_OSXCOCOAPORT=$(expr "$WX_SELECTEDCONFIG" : ".*osx_cocoa.*")
|
|
@@ -6279,6 +6264,7 @@ $as_echo_n "checking which wxWidgets toolkit was selec
|
|
WX_PORT="unknown"
|
|
if test "$WX_GTKPORT1" != "0"; then WX_PORT="gtk1"; fi
|
|
if test "$WX_GTKPORT2" != "0"; then WX_PORT="gtk2"; fi
|
|
+ if test "$WX_GTKPORT3" != "0"; then WX_PORT="gtk3"; fi
|
|
if test "$WX_MSWPORT" != "0"; then WX_PORT="msw"; fi
|
|
if test "$WX_MOTIFPORT" != "0"; then WX_PORT="motif"; fi
|
|
if test "$WX_OSXCOCOAPORT" != "0"; then WX_PORT="osx_cocoa"; fi
|
|
@@ -6353,9 +6339,6 @@ $as_echo "$WX_PORT" >&6; }
|
|
if test "$DEBUG" = "1"; then
|
|
CXXFLAGS="$CXXFLAGS -g -O0"
|
|
CFLAGS="$CFLAGS -g -O0"
|
|
- else
|
|
- CXXFLAGS="$CXXFLAGS -O2"
|
|
- CFLAGS="$CFLAGS -O2"
|
|
fi
|
|
|
|
if test "x$WX_RESCOMP" != x; then
|