Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove all unwanted occurrences of -mt/-pthread in configure.

Browse Source 
Remove all inappropriate compiler options and not just the first one as they
can occur multiple times because they may come from pkg-config output for
several different libraries.

Closes #13647.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69720 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2011-11-10 00:30:04 +00:00
parent 85fb0a0afd
commit 4fb1e79b4d
3 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
configure vendored
View File

@@ -55645,17 +55645,17 @@ WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS $TOOLCHAIN_DEFS"
case "${host}" in case "${host}" in
*-*-solaris2* ) *-*-solaris2* )
if test "$GCC" = yes; then if test "$GCC" = yes; then
CPPFLAGS=`echo $CPPFLAGS | sed 's/-mt//'` CPPFLAGS=`echo $CPPFLAGS | sed 's/-mt//g'`
LIBS=`echo $LIBS | sed 's/-mt//'` LIBS=`echo $LIBS | sed 's/-mt//g'`
EXTRALIBS_GUI=`echo $EXTRALIBS_GUI | sed 's/-mt//'` EXTRALIBS_GUI=`echo $EXTRALIBS_GUI | sed 's/-mt//g'`
fi fi
;; ;;
*-*-linux* ) *-*-linux* )
if test "x$SUNCXX" = xyes; then if test "x$SUNCXX" = xyes; then
CPPFLAGS=`echo $CPPFLAGS | sed 's/-pthread//'` CPPFLAGS=`echo $CPPFLAGS | sed 's/-pthread//g'`
LIBS=`echo $LIBS | sed 's/-pthread//'` LIBS=`echo $LIBS | sed 's/-pthread//g'`
EXTRALIBS_GUI=`echo $EXTRALIBS_GUI | sed 's/-pthread//'` EXTRALIBS_GUI=`echo $EXTRALIBS_GUI | sed 's/-pthread//g'`
fi fi
;; ;;
esac esac

12
configure.in
View File

@@ -8398,9 +8398,9 @@ case "${host}" in
dnl system packages are compiled with Sun CC and so pkg-config outputs dnl system packages are compiled with Sun CC and so pkg-config outputs
dnl CC-specific "-mt" flag, remove it when using gcc dnl CC-specific "-mt" flag, remove it when using gcc
if test "$GCC" = yes; then if test "$GCC" = yes; then
CPPFLAGS=`echo $CPPFLAGS | sed 's/-mt//'` CPPFLAGS=`echo $CPPFLAGS | sed 's/-mt//g'`
LIBS=`echo $LIBS | sed 's/-mt//'` LIBS=`echo $LIBS | sed 's/-mt//g'`
EXTRALIBS_GUI=`echo $EXTRALIBS_GUI | sed 's/-mt//'` EXTRALIBS_GUI=`echo $EXTRALIBS_GUI | sed 's/-mt//g'`
fi fi
;; ;;
@@ -8408,9 +8408,9 @@ case "${host}" in
dnl OTOH when using Sun CC under Linux, the flags contain gcc-specific dnl OTOH when using Sun CC under Linux, the flags contain gcc-specific
dnl -pthreads which Sun CC doesn't know about dnl -pthreads which Sun CC doesn't know about
if test "x$SUNCXX" = xyes; then if test "x$SUNCXX" = xyes; then
CPPFLAGS=`echo $CPPFLAGS | sed 's/-pthread//'` CPPFLAGS=`echo $CPPFLAGS | sed 's/-pthread//g'`
LIBS=`echo $LIBS | sed 's/-pthread//'` LIBS=`echo $LIBS | sed 's/-pthread//g'`
EXTRALIBS_GUI=`echo $EXTRALIBS_GUI | sed 's/-pthread//'` EXTRALIBS_GUI=`echo $EXTRALIBS_GUI | sed 's/-pthread//g'`
fi fi
;; ;;
esac esac

12
src/gtk/dataview.cpp
View File

@@ -2570,11 +2570,13 @@ void wxDataViewProgressRenderer::GTKSetLabel()
// Take care to not use GetOwner() here if the label is empty, we can be // Take care to not use GetOwner() here if the label is empty, we can be
// called from ctor when GetOwner() is still NULL in this case. // called from ctor when GetOwner() is still NULL in this case.
g_value_set_string( &gvalue, wxScopedCharBuffer buf;
m_label.empty() ? "" if ( m_label.empty() )
: wxGTK_CONV_FONT(m_label, buf = wxScopedCharBuffer::CreateNonOwned("");
GetOwner()->GetOwner()->GetFont()) else
); buf = wxGTK_CONV_FONT(m_label, GetOwner()->GetOwner()->GetFont());
g_value_set_string( &gvalue, buf);
g_object_set_property( G_OBJECT(m_renderer), "text", &gvalue ); g_object_set_property( G_OBJECT(m_renderer), "text", &gvalue );
g_value_unset( &gvalue ); g_value_unset( &gvalue );