From: Adrian Szyndela <adrian.s@samsung.com>
Date: Fri, 17 Jan 2020 11:35:01 +0000 (+0100)
Subject: Merge 2.55.1 into tizen
X-Git-Tag: submit/tizen/20200131.142009^2~26
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f16be3c8039d8bf59d3fb6655b31a21c05cfc298;p=platform%2Fupstream%2Fglib.git

Merge 2.55.1 into tizen

Change-Id: Ifc32b4cc67f8ecfc5a1dde9f88af171e0d6f7a68
---

f16be3c8039d8bf59d3fb6655b31a21c05cfc298
diff --cc configure.ac
index 23f6d5d,b28dbfb..d6cbd9f
--- a/configure.ac
+++ b/configure.ac
@@@ -252,14 -252,6 +252,10 @@@ AC_ARG_ENABLE(mem_pools
                [AS_HELP_STRING([--disable-mem-pools],
  			      [disable all glib memory pools])],,
  	      [disable_mem_pools=no])
- AC_ARG_ENABLE(rebuilds,
-               [AS_HELP_STRING([--disable-rebuilds],
-                               [disable all source autogeneration rules])],,
-               [enable_rebuilds=yes])
 +AC_ARG_ENABLE(libdbuspolicy,
 +              [AS_HELP_STRING([--enable-libdbuspolicy],
 +                              [enable libdbuspolicy for kdbus transport [default=no]])],,
 +              [enable_libdbuspolicy=no])
  
  GLIB_TESTS
  
@@@ -2654,43 -2630,14 +2644,51 @@@ AS_IF([ test "x$use_gcov" = "xyes"], 
    LDFLAGS="$LDFLAGS -lgcov"
  ])
  
 +dnl ************************************
 +dnl *** Enable gcov (without lcov) coverage reports ***
 +dnl ************************************
 +
 +AC_ARG_ENABLE(gcov-coverage,
 +  AS_HELP_STRING([--enable-gcov-coverage],
 +		 [enable coverage testing with gcov, without lcov]),
 +  [use_only_gcov=$enableval], [use_only_gcov=no])
 +
 +AS_IF([ test "x$use_only_gcov" = "xyes"], [
 +  dnl we need gcc:
 +  if test "$GCC" != "yes"; then
 +    AC_MSG_ERROR([GCC is required for --enable-gcov-coverage])
 +  fi
 +
 +  dnl Check if ccache is being used
 +  AC_CHECK_PROG(SHTOOL, shtool, shtool)
 +  case `$SHTOOL path $CC` in
 +    *ccache*[)] gcc_ccache=yes;;
 +    *[)] gcc_ccache=no;;
 +  esac
 +
 +  if test "$gcc_ccache" = "yes" && (test -z "$CCACHE_DISABLE" || test "$CCACHE_DISABLE" != "1"); then
 +    AC_MSG_ERROR([ccache must be disabled when --enable-coverage option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.])
 +  fi
 +
 +  dnl Remove all optimization flags from CFLAGS
 +  changequote({,})
 +  CFLAGS=`echo "$CFLAGS" | $SED -e 's/-Wl,-O[0-9]*//g'`
 +  CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9]*//g'`
 +  changequote([,])
 +
 +  dnl Add the special gcc flags
 +  CFLAGS="$CFLAGS -O0 -fprofile-arcs -ftest-coverage"
 +  LDFLAGS="$LDFLAGS -lgcov"
 +])
 +
+ dnl *******************************
+ dnl *** Disable strict aliasing ***
+ dnl *******************************
+ dnl See https://bugzilla.gnome.org/show_bug.cgi?id=791622
+ AS_IF([test "${GCC}" = "yes"],[
+   CFLAGS="$CFLAGS -fno-strict-aliasing"
+ ])
+ 
  dnl ******************************
  dnl *** output the whole stuff ***
  dnl ******************************
diff --cc gio/gdbusconnection.c
index 26bc164,9999806..e8fb9ac
mode 100755,100644..100755
--- a/gio/gdbusconnection.c
+++ b/gio/gdbusconnection.c