RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: [email protected] Module: popt Date: 28-Oct-2010 18:05:49 Branch: HEAD Handle: 2010102816054800 Modified files: popt Makefile.am configure.ac Log: added mudflap experimental build support Summary: Revision Changes Path 1.73 +1 -1 popt/Makefile.am 1.77 +42 -0 popt/configure.ac ____________________________________________________________________________ patch -p0 <<'@@ .' Index: popt/Makefile.am ============================================================================ $ cvs diff -u -r1.72 -r1.73 Makefile.am --- popt/Makefile.am 26 Oct 2010 16:22:06 -0000 1.72 +++ popt/Makefile.am 28 Oct 2010 16:05:48 -0000 1.73 @@ -34,7 +34,7 @@ test2_LDADD = $(top_builddir)/$(usrlib_LTLIBRARIES) tdict_LDADD = $(top_builddir)/$(usrlib_LTLIBRARIES) -TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) testpoptrc="$(top_srcdir)/test-poptrc" PATH=.:../src:$$PATH \ +TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) MUDFLAP_OPTIONS="$(MUDFLAP_OPTIONS)" testpoptrc="$(top_srcdir)/test-poptrc" PATH=.:../src:$$PATH \ $(VALGRIND_ENVIRONMENT) \ $(SHELL) @@ . patch -p0 <<'@@ .' Index: popt/configure.ac ============================================================================ $ cvs diff -u -r1.76 -r1.77 configure.ac --- popt/configure.ac 26 Oct 2010 16:09:39 -0000 1.76 +++ popt/configure.ac 28 Oct 2010 16:05:48 -0000 1.77 @@ -66,6 +66,46 @@ popt_CFLAGS_ADD([-Wpointer-arith],[POPT_CFLAGS]) ]) +# build popt with mudflap instrumentation (GCC only) +popt_gcc_mudflap=no +AC_ARG_ENABLE([mudflap], + [AS_HELP_STRING([--enable-mudflap], + [build POPT with mudflap instrumentation (@<:@default=no@:>@) (with GCC only) (EXPERIMENTAL)])], + [case $enableval in + yes|no) ;; + *) AC_MSG_ERROR([bad value $enableval for mudflap option]) ;; + esac + popt_gcc_mudflap=$enableval], +[ popt_gcc_mudflap=no ]) + +AS_IF([ test x"$popt_gcc_mudflap" = x"yes" ], + [ + AS_IF([test "x$GCC" != x], + [ + old_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -fmudflap" + old_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -lmudflap" + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[popt_gcc_mudflap=yes],[popt_gcc_mudflap=fail]) + CFLAGS="$old_CFLAGS" + LDFLAGS="$old_LDFLAGS" + AS_IF([ test "$popt_gcc_mudflap" = fail ], + [ + AC_MSG_WARN([--enable-mudflap requires a compiler which understands this option.]) + ], + [ + popt_CFLAGS_ADD([-fmudflap], [POPT_CFLAGS]) + popt_LDFLAGS_ADD([-lmudflap], [POPT_LDFLAGS]) + # XXX: memory leak ? + #MUDFLAP_OPTIONS="-mode-check -abbreviate -viol-abort -check-initialization -print-leaks" + MUDFLAP_OPTIONS="-mode-check -abbreviate -check-initialization" + AC_SUBST([MUDFLAP_OPTIONS]) + ]) + ], + [ AC_MSG_WARN([--enable-mudflap requires GCC])] + ) + ]) + # build popt instrumented for -fPIE (GCC only) AC_ARG_ENABLE([build-pie], @@ -103,6 +143,8 @@ # Finally put an AC_SUBST for all the CFLAGS above AC_SUBST([POPT_CFLAGS]) +# + # Support for running test cases using valgrind: use_valgrind=false @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
