Attachment 46531 Details for Bug 37060 – [PATCH 3/3] Force a full rebuild for new gcc versions if gcov is enabled

[patch] [PATCH 3/3] Force a full rebuild for new gcc versions if gcov is enabled

0003-Force-a-full-rebuild-for-new-gcc-versions-if-gcov-is.patch (text/plain), 1.87 KB, created by Simon McVittie on 2011-05-10 03:32:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-05-10 03:32:36 UTC

Size: 1.87 KB

patch

obsolete

>From e0f117b8f5bb1af4a9087ff23641317e4ab41fef Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Wed, 4 May 2011 15:16:36 +0100
>Subject: [PATCH 3/3] Force a full rebuild for new gcc versions if gcov is
> enabled
>
>This avoids a lot of "Version mismatch - expected 406p got 405*". Because
>we're changing the content of each file after preprocessing, it even
>defeats ccache, which is desirable here - otherwise we'd get old versions
>of the profiling code being resurrected from the cache.
>---
> configure.ac |   17 ++++-------------
> 1 files changed, 4 insertions(+), 13 deletions(-)
>
>diff --git a/configure.ac b/configure.ac
>index 27e8887..647c6fc 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -226,20 +226,11 @@ CPPFLAGS=`echo "$CPPFLAGS" | sed -e 's/ +/ /g'`
> changequote([,])dnl
> 
> if test x$enable_gcov = xyes; then
>-     ## so that config.h changes when you toggle gcov support
>-     AC_DEFINE_UNQUOTED(DBUS_GCOV_ENABLED, 1, [Defined if gcov is enabled to force a rebuild due to config.h changing])
>-
>-     AC_MSG_CHECKING([for gcc 3.3 version of gcov file format])
>-     have_gcc33_gcov=no
>-     AC_RUN_IFELSE( [AC_LANG_PROGRAM( , [[ if (__GNUC__ >=3 && __GNUC_MINOR__ >= 3) exit (0); else exit (1); ]])],  
>-                   have_gcc33_gcov=yes)
>-     if test x$have_gcc33_gcov = xyes ; then
>-         AC_DEFINE_UNQUOTED(DBUS_HAVE_GCC33_GCOV, 1, [Defined if we have gcc 3.3 and thus the new gcov format])
>-     fi
>-     AC_MSG_RESULT($have_gcc33_gcov)
>+     # so that config.h changes when you toggle gcov support
>+     AC_DEFINE_UNQUOTED([DBUS_GCOV_ENABLED],
>+       [__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__],
>+       [Defined to the gcc version if gcov is enabled, to force a rebuild due to config.h changing])
> fi
>-AM_CONDITIONAL(DBUS_GCOV_ENABLED, test x$enable_gcov = xyes)
>-
> 
> #### Various functions
> AC_SEARCH_LIBS([socket], [socket])
>-- 
>1.7.5.1
>

Actions: View | Splinter Review

Attachments on bug 37060: 46529 | 46530 | 46531

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.