Ticket #13060: trac_13060-spkg.diff

.hgtags

@@ -1 +1 @@
 be07ce4f9315e60f372029ce1d347cc08d2563a9 valgrind-3.7.0
+6aeb3b4abeff000efa9cdda6225efd0a641ce730 valgrind-3.7.0.p0

SPKG.txt

@@ -41 +41 @@
 
 == Changelog ==
 
+=== valgrind-3.7.0.p0 (Jean-Pierre Flori, May 29th, 2012)  ===
+ Trac #13060:
+ * applied upstream svn commit r12323 to accept glibc-2.15
+ * applied upstream svn commit r12396 to accept automake-1.11.2 and later
+ * ran autogen.sh from upstream svn to regenerate build system
+
 === valgrind-3.7.0 (Ivan Andrus, February 16th, 2012)  ===
  * update to 3.7.0
  * removed call to autoreconf

new file patches/automake-1.11.2.diff

@@ +1 @@
+Index: Makefile.am
+===================================================================
+--- Makefile.am (revision 12395)
++++ Makefile.am (revision 12396)
+@@ -51,7 +51,8 @@
+ # default.supp, as it is built from the base .supp files at compile-time.
+ dist_noinst_DATA = $(SUPP_FILES)
+ 
+-pkglib_DATA = default.supp
++vglibdir = $(pkglibdir)
++vglib_DATA = default.supp
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = valgrind.pc
+Index: coregrind/Makefile.am
+===================================================================
+--- coregrind/Makefile.am       (revision 12395)
++++ coregrind/Makefile.am       (revision 12396)
+@@ -513,7 +513,8 @@
+        m_gdbserver/powerpc-altivec64l.xml
+ 
+ # so as to make sure these get copied into the install tree
+-pkglib_DATA  = $(GDBSERVER_XML_FILES)
++vglibdir = $(pkglibdir)
++vglib_DATA  = $(GDBSERVER_XML_FILES)
+ 
+ # so as to make sure these get copied into the tarball
+ EXTRA_DIST  += $(GDBSERVER_XML_FILES)

new file patches/glibc-2.15.diff

@@ +1 @@
+Index: configure.in
+===================================================================
+--- configure.in        (revision 12322)
++++ configure.in        (revision 12323)
+@@ -778,6 +778,13 @@
+        DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+        DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+        ;;
++     2.15)
++       AC_MSG_RESULT(2.15 family)
++       AC_DEFINE([GLIBC_2_15], 1, [Define to 1 if you're using glibc 2.15.x])
++       DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
++       DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
++       DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
++       ;;
+      darwin)
+        AC_MSG_RESULT(Darwin)
+        AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])
+@@ -791,7 +798,7 @@
+ 
+      *)
+        AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
+-       AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.14])
++       AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.15])
+        AC_MSG_ERROR([or Darwin libc])
+        ;;
+ esac