bump version

[buildroot.git] / package / valgrind / valgrind-3.3.1-disable-helgrind.patch

diff -rdup valgrind-3.3.1.old/configure valgrind-3.3.1/configure
--- valgrind-3.3.1.old/configure        2008-06-01 03:44:42.000000000 +0200
+++ valgrind-3.3.1/configure    2008-11-17 16:49:39.000000000 +0100
@@ -311,7 +311,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT VEX_DIR DISTCHECK_CONFIGURE_FLAGS LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE RANLIB ac_ct_RANLIB PERL GDB CCAS CCASFLAGS build build_cpu build_vendor build_os host host_cpu host_vendor host_os VG_ARCH VG_ARCH_ALL VALT_LOAD_ADDRESS VG_OS VG_PLATFORM_PRI VG_PLATFORM_SEC VGP_X86_LINUX_TRUE VGP_X86_LINUX_FALSE VGP_AMD64_LINUX_TRUE VGP_AMD64_LINUX_FALSE VGP_PPC32_LINUX_TRUE VGP_PPC32_LINUX_FALSE VGP_PPC64_LINUX_TRUE VGP_PPC64_LINUX_FALSE VGP_PPC32_AIX5_TRUE VGP_PPC32_AIX5_FALSE VGP_PPC64_AIX5_TRUE VGP_PPC64_AIX5_FALSE VGO_LINUX_TRUE VGO_LINUX_FALSE VGO_AIX5_TRUE VGO_AIX5_FALSE VGP_HAVE_SECONDARY_TRUE VGP_HAVE_SECONDARY_FALSE DEFAULT_SUPP EGREP FLAG_M32 FLAG_MAIX32 FLAG_M64 FLAG_MAIX64 FLAG_MMMX FLAG_MSSE PREFERRED_STACK_BOUNDARY FLAG_WDECL_AFTER_STMT FLAG_FNO_STACK_PROTECTOR BUILD_SSE3_TESTS_TRUE BUILD_SSE3_TESTS_FALSE LIBOBJS MPI_CC BUILD_MPIWRAP_PRI_TRUE BUILD_MPIWRAP_PRI_FALSE BUILD_MPIWRAP_SEC_TRUE BUILD_MPIWRAP_SEC_FALSE LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT VEX_DIR DISTCHECK_CONFIGURE_FLAGS LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE RANLIB ac_ct_RANLIB PERL GDB CCAS CCASFLAGS build build_cpu build_vendor build_os host host_cpu host_vendor host_os VG_ARCH VG_ARCH_ALL VALT_LOAD_ADDRESS VG_OS VG_PLATFORM_PRI VG_PLATFORM_SEC VGP_X86_LINUX_TRUE VGP_X86_LINUX_FALSE VGP_AMD64_LINUX_TRUE VGP_AMD64_LINUX_FALSE VGP_PPC32_LINUX_TRUE VGP_PPC32_LINUX_FALSE VGP_PPC64_LINUX_TRUE VGP_PPC64_LINUX_FALSE VGP_PPC32_AIX5_TRUE VGP_PPC32_AIX5_FALSE VGP_PPC64_AIX5_TRUE VGP_PPC64_AIX5_FALSE VGO_LINUX_TRUE VGO_LINUX_FALSE VGO_AIX5_TRUE VGO_AIX5_FALSE VGP_HAVE_SECONDARY_TRUE VGP_HAVE_SECONDARY_FALSE DEFAULT_SUPP EGREP FLAG_M32 FLAG_MAIX32 FLAG_M64 FLAG_MAIX64 FLAG_MMMX FLAG_MSSE PREFERRED_STACK_BOUNDARY FLAG_WDECL_AFTER_STMT FLAG_FNO_STACK_PROTECTOR BUILD_SSE3_TESTS_TRUE BUILD_SSE3_TESTS_FALSE LIBOBJS MPI_CC BUILD_MPIWRAP_PRI_TRUE BUILD_MPIWRAP_PRI_FALSE BUILD_MPIWRAP_SEC_TRUE BUILD_MPIWRAP_SEC_FALSE HELGRIND LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -880,6 +880,7 @@ Optional Features:
   --enable-inner          enables self-hosting
   --enable-only64bit      do a 64-bit only build
   --enable-only32bit      do a 32-bit only build
+  --enable-helgrind       enable helgrind build
   --enable-tls            platform supports TLS
 
 Optional Packages:
@@ -4113,6 +4114,21 @@ echo "$as_me: error: Nonsensical: both -
    { (exit 1); exit 1; }; }
 fi
 
+echo "$as_me:$LINENO: checking if we want to build helgrind" >&5
+echo $ECHO_N "checking if we want to build helgrind... $ECHO_C" >&6
+if test "${vg_cv_enable_helgrind+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  # Check whether --enable-helgrind or --disable-helgrind was given.
+if test "${enable_helgrind+set}" = set; then
+  enableval="$enable_helgrind"
+  vg_cv_enable_helgrind=$enableval
+else
+  vg_cv_enable_helgrind=no
+fi;
+fi
+echo "$as_me:$LINENO: result: $vg_cv_enable_helgrind" >&5
+echo "${ECHO_T}$vg_cv_enable_helgrind" >&6
 
 
 echo "$as_me:$LINENO: checking for a supported OS" >&5
@@ -7517,8 +7533,13 @@ fi
 
 
 # -------------------- ok.  We're done. --------------------
+if test "x$vg_cv_enable_helgrind" = "xyes"
+then
+  HELGRIND_OUTPUT="helgrind/Makefile"
+  HELGRIND="helgrind"
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        ac_config_files="$ac_config_files Makefile valgrind.spec valgrind.pc docs/Makefile docs/lib/Makefile docs/images/Makefile docs/internals/Makefile docs/xml/Makefile tests/Makefile tests/vg_regtest perf/Makefile perf/vg_perf include/Makefile include/vki/Makefile auxprogs/Makefile coregrind/Makefile memcheck/Makefile memcheck/tests/Makefile memcheck/tests/amd64/Makefile memcheck/tests/ppc32/Makefile memcheck/tests/ppc64/Makefile memcheck/tests/x86/Makefile memcheck/docs/Makefile cachegrind/Makefile cachegrind/tests/Makefile cachegrind/tests/amd64/Makefile cachegrind/tests/ppc32/Makefile cachegrind/tests/ppc64/Makefile cachegrind/tests/x86/Makefile cachegrind/docs/Makefile cachegrind/cg_annotate callgrind/Makefile callgrind/callgrind_annotate callgrind/callgrind_control callgrind/tests/Makefile callgrind/docs/Makefile helgrind/Makefile helgrind/tests/Makefile helgrind/docs/Makefile massif/Makefile massif/tests/Makefile massif/perf/Makefile massif/docs/Makefile massif/ms_print lackey/Makefile lackey/tests/Makefile lackey/docs/Makefile none/Makefile none/tests/Makefile none/tests/amd64/Makefile none/tests/ppc32/Makefile none/tests/ppc64/Makefile none/tests/x86/Makefile none/docs/Makefile exp-omega/Makefile exp-omega/tests/Makefile exp-omega/docs/Makefile exp-drd/Makefile exp-drd/docs/Makefile exp-drd/tests/Makefile"
+fi
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        ac_config_files="$ac_config_files Makefile valgrind.spec valgrind.pc docs/Makefile docs/lib/Makefile docs/images/Makefile docs/internals/Makefile docs/xml/Makefile tests/Makefile tests/vg_regtest perf/Makefile perf/vg_perf include/Makefile include/vki/Makefile auxprogs/Makefile coregrind/Makefile memcheck/Makefile memcheck/tests/Makefile memcheck/tests/amd64/Makefile memcheck/tests/ppc32/Makefile memcheck/tests/ppc64/Makefile memcheck/tests/x86/Makefile memcheck/docs/Makefile cachegrind/Makefile cachegrind/tests/Makefile cachegrind/tests/amd64/Makefile cachegrind/tests/ppc32/Makefile cachegrind/tests/ppc64/Makefile cachegrind/tests/x86/Makefile cachegrind/docs/Makefile cachegrind/cg_annotate callgrind/Makefile callgrind/callgrind_annotate callgrind/callgrind_control callgrind/tests/Makefile callgrind/docs/Makefile $HELGRIND_OUTPUT helgrind/tests/Makefile helgrind/docs/Makefile massif/Makefile massif/tests/Makefile massif/perf/Makefile massif/docs/Makefile massif/ms_print lackey/Makefile lackey/tests/Makefile lackey/docs/Makefile none/Makefile none/tests/Makefile none/tests/amd64/Makefile none/tests/ppc32/Makefile none/tests/ppc64/Makefile none/tests/x86/Makefile none/docs/Makefile exp-omega/Makefile exp-omega/tests/Makefile exp-omega/docs/Makefile exp-drd/Makefile exp-drd/docs/Makefile exp-drd/tests/Makefile"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -8202,7 +8223,7 @@ do
   "callgrind/callgrind_control" ) CONFIG_FILES="$CONFIG_FILES callgrind/callgrind_control" ;;
   "callgrind/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES callgrind/tests/Makefile" ;;
   "callgrind/docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES callgrind/docs/Makefile" ;;
-  "helgrind/Makefile" ) CONFIG_FILES="$CONFIG_FILES helgrind/Makefile" ;;
+  "$HELGRIND_OUTPUT" ) CONFIG_FILES="$CONFIG_FILES $HELGRIND_OUTPUT" ;;
   "helgrind/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES helgrind/tests/Makefile" ;;
   "helgrind/docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES helgrind/docs/Makefile" ;;
   "massif/Makefile" ) CONFIG_FILES="$CONFIG_FILES massif/Makefile" ;;
@@ -8421,6 +8442,7 @@ s,@BUILD_MPIWRAP_PRI_TRUE@,$BUILD_MPIWRA
 s,@BUILD_MPIWRAP_PRI_FALSE@,$BUILD_MPIWRAP_PRI_FALSE,;t t
 s,@BUILD_MPIWRAP_SEC_TRUE@,$BUILD_MPIWRAP_SEC_TRUE,;t t
 s,@BUILD_MPIWRAP_SEC_FALSE@,$BUILD_MPIWRAP_SEC_FALSE,;t t
+s,@HELGRIND@,$HELGRIND,;t t
 s,@LTLIBOBJS@,$LTLIBOBJS,;t t
 CEOF
 
diff -rdup valgrind-3.3.1.old/configure.in valgrind-3.3.1/configure.in
--- valgrind-3.3.1.old/configure.in     2008-06-01 03:39:06.000000000 +0200
+++ valgrind-3.3.1/configure.in 2008-11-17 16:49:34.000000000 +0100
@@ -207,6 +207,11 @@ if test x$vg_cv_only64bit = xyes -a x$vg
       [Nonsensical: both --enable-only64bit and --enable-only32bit.])
 fi
 
+AC_CACHE_CHECK([if we want to build helgrind], vg_cv_enable_helgrind,
+   [AC_ARG_ENABLE(helgrind, 
+      AC_HELP_STRING([--enable-helgrind],[enable helgrind build]),
+      [vg_cv_enable_helgrind=$enableval],
+      [vg_cv_enable_helgrind=no])])
 
 
 AC_MSG_CHECKING([for a supported OS])
@@ -975,7 +980,12 @@ AM_CONDITIONAL(BUILD_MPIWRAP_SEC, test x
 
 
 # -------------------- ok.  We're done. --------------------
-
+if test "x$vg_cv_enable_helgrind" = "xyes"
+then
+  HELGRIND_OUTPUT="helgrind/Makefile"
+  HELGRIND="helgrind"
+  AC_SUBST(HELGRIND)
+fi
 AC_OUTPUT(
    Makefile 
    valgrind.spec
@@ -1013,7 +1023,7 @@ AC_OUTPUT(
    callgrind/callgrind_control
    callgrind/tests/Makefile
    callgrind/docs/Makefile
-   helgrind/Makefile
+   $HELGRIND_OUTPUT
    helgrind/tests/Makefile
    helgrind/docs/Makefile
    massif/Makefile
diff -rdup valgrind-3.3.1.old/Makefile.am valgrind-3.3.1/Makefile.am
--- valgrind-3.3.1.old/Makefile.am      2008-06-01 03:39:06.000000000 +0200
+++ valgrind-3.3.1/Makefile.am  2008-11-17 16:44:47.000000000 +0100
@@ -9,7 +9,7 @@ TOOLS =         memcheck \
                massif \
                lackey \
                none \
-               helgrind
+               @HELGRIND@
 
 EXP_TOOLS =    exp-omega \
                exp-drd
--- valgrind-3.3.1.old/Makefile.in      2008-11-17 16:20:18.000000000 +0100
+++ valgrind-3.3.1/Makefile.in  2008-11-17 16:51:22.000000000 +0100
@@ -242,7 +242,7 @@
                massif \
                lackey \
                none \
-               helgrind
+               @HELGRIND@
 
 EXP_TOOLS = exp-omega \
                exp-drd