Ticket #13060: trac_13060-spkg.diff

File trac_13060-spkg.diff, 3.1 KB (added by jpflori, 9 years ago)

Spkg diff, for review only.

  • .hgtags

    diff -r 9d9368327877 -r c17a8b5dacd6 .hgtags
    a b  
    11be07ce4f9315e60f372029ce1d347cc08d2563a9 valgrind-3.7.0
     26aeb3b4abeff000efa9cdda6225efd0a641ce730 valgrind-3.7.0.p0
  • SPKG.txt

    diff -r 9d9368327877 -r c17a8b5dacd6 SPKG.txt
    a b  
    4141
    4242== Changelog ==
    4343
     44=== valgrind-3.7.0.p0 (Jean-Pierre Flori, May 29th, 2012)  ===
     45 Trac #13060:
     46 * applied upstream svn commit r12323 to accept glibc-2.15
     47 * applied upstream svn commit r12396 to accept automake-1.11.2 and later
     48 * ran autogen.sh from upstream svn to regenerate build system
     49
    4450=== valgrind-3.7.0 (Ivan Andrus, February 16th, 2012)  ===
    4551 * update to 3.7.0
    4652 * removed call to autoreconf
  • new file patches/automake-1.11.2.diff

    diff -r 9d9368327877 -r c17a8b5dacd6 patches/automake-1.11.2.diff
    - +  
     1Index: Makefile.am
     2===================================================================
     3--- Makefile.am (revision 12395)
     4+++ Makefile.am (revision 12396)
     5@@ -51,7 +51,8 @@
     6 # default.supp, as it is built from the base .supp files at compile-time.
     7 dist_noinst_DATA = $(SUPP_FILES)
     8 
     9-pkglib_DATA = default.supp
     10+vglibdir = $(pkglibdir)
     11+vglib_DATA = default.supp
     12 
     13 pkgconfigdir = $(libdir)/pkgconfig
     14 pkgconfig_DATA = valgrind.pc
     15Index: coregrind/Makefile.am
     16===================================================================
     17--- coregrind/Makefile.am       (revision 12395)
     18+++ coregrind/Makefile.am       (revision 12396)
     19@@ -513,7 +513,8 @@
     20        m_gdbserver/powerpc-altivec64l.xml
     21 
     22 # so as to make sure these get copied into the install tree
     23-pkglib_DATA  = $(GDBSERVER_XML_FILES)
     24+vglibdir = $(pkglibdir)
     25+vglib_DATA  = $(GDBSERVER_XML_FILES)
     26 
     27 # so as to make sure these get copied into the tarball
     28 EXTRA_DIST  += $(GDBSERVER_XML_FILES)
  • new file patches/glibc-2.15.diff

    diff -r 9d9368327877 -r c17a8b5dacd6 patches/glibc-2.15.diff
    - +  
     1Index: configure.in
     2===================================================================
     3--- configure.in        (revision 12322)
     4+++ configure.in        (revision 12323)
     5@@ -778,6 +778,13 @@
     6        DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
     7        DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
     8        ;;
     9+     2.15)
     10+       AC_MSG_RESULT(2.15 family)
     11+       AC_DEFINE([GLIBC_2_15], 1, [Define to 1 if you're using glibc 2.15.x])
     12+       DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
     13+       DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
     14+       DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
     15+       ;;
     16      darwin)
     17        AC_MSG_RESULT(Darwin)
     18        AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])
     19@@ -791,7 +798,7 @@
     20 
     21      *)
     22        AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
     23-       AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.14])
     24+       AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.15])
     25        AC_MSG_ERROR([or Darwin libc])
     26        ;;
     27 esac