[arch-commits] Commit in valgrind/trunk (3 files)
Allan McRae
allan at archlinux.org
Thu Feb 17 12:26:48 UTC 2011
Date: Thursday, February 17, 2011 @ 07:26:47
Author: allan
Revision: 110184
upgpkg: valgrind 3.6.1-1
upstream update, remove patches applied upstream
Modified:
valgrind/trunk/PKGBUILD
Deleted:
valgrind/trunk/glibc-2.13-strcasecmp.patch
valgrind/trunk/glibc-2.13.patch
-----------------------------+
PKGBUILD | 20 +----
glibc-2.13-strcasecmp.patch | 151 ------------------------------------------
glibc-2.13.patch | 33 ---------
3 files changed, 5 insertions(+), 199 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-02-17 12:11:03 UTC (rev 110183)
+++ PKGBUILD 2011-02-17 12:26:47 UTC (rev 110184)
@@ -3,8 +3,8 @@
# Maintainer: Allan McRae <allan at archlinux.org>
pkgname=valgrind
-pkgver=3.6.0
-pkgrel=3
+pkgver=3.6.1
+pkgrel=1
pkgdesc="A tool to help find memory-management problems in programs"
arch=('i686' 'x86_64')
license=('GPL')
@@ -13,13 +13,9 @@
makedepends=('gdb')
options=('!emptydirs')
source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2
- glibc-patch-version.patch
- glibc-2.13.patch
- glibc-2.13-strcasecmp.patch)
-md5sums=('b289c5f4ab8e39741602445f1dd09b34'
- 'b657f0ebdde3d9aefc9fd16f9e653702'
- '3706469d3b712f420e161a5ba1143d02'
- 'd593be202296116653c792556ab6db73')
+ glibc-patch-version.patch)
+md5sums=('2c3aa122498baecc9d69194057ca88f5'
+ 'b657f0ebdde3d9aefc9fd16f9e653702')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -30,12 +26,6 @@
# prevent need to rebuild with glibc patch level version bumps
patch -Np1 -i ${srcdir}/glibc-patch-version.patch
- # glibc-2.13 "compatibility"
- patch -Np1 -i ${srcdir}/glibc-2.13.patch
-
- # http://bugs.kde.org/show_bug.cgi?id=256600
- patch -Np0 -i ${srcdir}/glibc-2.13-strcasecmp.patch
-
if [ "${CARCH}" = "x86_64" ]; then
./configure --prefix=/usr --mandir=/usr/share/man --enable-only64bit
else
Deleted: glibc-2.13-strcasecmp.patch
===================================================================
--- glibc-2.13-strcasecmp.patch 2011-02-17 12:11:03 UTC (rev 110183)
+++ glibc-2.13-strcasecmp.patch 2011-02-17 12:26:47 UTC (rev 110184)
@@ -1,151 +0,0 @@
-Index: memcheck/mc_replace_strmem.c
-===================================================================
---- memcheck/mc_replace_strmem.c (revision 11477)
-+++ memcheck/mc_replace_strmem.c (revision 11478)
-@@ -35,10 +35,13 @@
- #include "pub_tool_redir.h"
- #include "pub_tool_tooliface.h"
- #include "valgrind.h"
-+#include "config.h"
-
- #include "mc_include.h"
- #include "memcheck.h"
-
-+#include <ctype.h>
-+
- /* ---------------------------------------------------------------------
- We have our own versions of these functions for two reasons:
- (a) it allows us to do overlap checking
-@@ -403,6 +406,120 @@
- #endif
-
-
-+#define STRCASECMP(soname, fnname) \
-+ int VG_REPLACE_FUNCTION_ZU(soname,fnname) \
-+ ( const char* s1, const char* s2 ); \
-+ int VG_REPLACE_FUNCTION_ZU(soname,fnname) \
-+ ( const char* s1, const char* s2 ) \
-+ { \
-+ register unsigned char c1; \
-+ register unsigned char c2; \
-+ while (True) { \
-+ c1 = tolower(*(unsigned char *)s1); \
-+ c2 = tolower(*(unsigned char *)s2); \
-+ if (c1 != c2) break; \
-+ if (c1 == 0) break; \
-+ s1++; s2++; \
-+ } \
-+ if ((unsigned char)c1 < (unsigned char)c2) return -1; \
-+ if ((unsigned char)c1 > (unsigned char)c2) return 1; \
-+ return 0; \
-+ }
-+
-+STRCASECMP(VG_Z_LIBC_SONAME, strcasecmp)
-+#if defined(VGO_linux)
-+STRCASECMP(VG_Z_LIBC_SONAME, __GI_strcasecmp)
-+#endif
-+
-+
-+#define STRNCASECMP(soname, fnname) \
-+ int VG_REPLACE_FUNCTION_ZU(soname,fnname) \
-+ ( const char* s1, const char* s2, SizeT nmax ); \
-+ int VG_REPLACE_FUNCTION_ZU(soname,fnname) \
-+ ( const char* s1, const char* s2, SizeT nmax ) \
-+ { \
-+ SizeT n = 0; \
-+ while (True) { \
-+ if (n >= nmax) return 0; \
-+ if (*s1 == 0 && *s2 == 0) return 0; \
-+ if (*s1 == 0) return -1; \
-+ if (*s2 == 0) return 1; \
-+ \
-+ if (tolower(*(unsigned char*)s1) < tolower(*(unsigned char*)s2)) return -1; \
-+ if (tolower(*(unsigned char*)s1) > tolower(*(unsigned char*)s2)) return 1; \
-+ \
-+ s1++; s2++; n++; \
-+ } \
-+ }
-+
-+STRNCASECMP(VG_Z_LIBC_SONAME, strncasecmp)
-+#if defined(VGO_linux)
-+STRNCASECMP(VG_Z_LIBC_SONAME, __GI_strncasecmp)
-+#elif defined(VGO_darwin)
-+STRNCASECMP(VG_Z_DYLD, strncasecmp)
-+#endif
-+
-+
-+#ifdef HAVE_TOLOWER_L
-+
-+
-+#define STRCASECMP_L(soname, fnname) \
-+ int VG_REPLACE_FUNCTION_ZU(soname,fnname) \
-+ ( const char* s1, const char* s2, locale_t locale ); \
-+ int VG_REPLACE_FUNCTION_ZU(soname,fnname) \
-+ ( const char* s1, const char* s2, locale_t locale ) \
-+ { \
-+ register unsigned char c1; \
-+ register unsigned char c2; \
-+ while (True) { \
-+ c1 = tolower_l(*(unsigned char *)s1, locale); \
-+ c2 = tolower_l(*(unsigned char *)s2, locale); \
-+ if (c1 != c2) break; \
-+ if (c1 == 0) break; \
-+ s1++; s2++; \
-+ } \
-+ if ((unsigned char)c1 < (unsigned char)c2) return -1; \
-+ if ((unsigned char)c1 > (unsigned char)c2) return 1; \
-+ return 0; \
-+ }
-+
-+STRCASECMP_L(VG_Z_LIBC_SONAME, strcasecmp_l)
-+#if defined(VGO_linux)
-+STRCASECMP_L(VG_Z_LIBC_SONAME, __GI_strcasecmp_l)
-+#endif
-+
-+
-+#define STRNCASECMP_L(soname, fnname) \
-+ int VG_REPLACE_FUNCTION_ZU(soname,fnname) \
-+ ( const char* s1, const char* s2, SizeT nmax, locale_t locale ); \
-+ int VG_REPLACE_FUNCTION_ZU(soname,fnname) \
-+ ( const char* s1, const char* s2, SizeT nmax, locale_t locale ) \
-+ { \
-+ SizeT n = 0; \
-+ while (True) { \
-+ if (n >= nmax) return 0; \
-+ if (*s1 == 0 && *s2 == 0) return 0; \
-+ if (*s1 == 0) return -1; \
-+ if (*s2 == 0) return 1; \
-+ \
-+ if (tolower_l(*(unsigned char*)s1, locale) < tolower_l(*(unsigned char*)s2, locale)) return -1; \
-+ if (tolower_l(*(unsigned char*)s1, locale) > tolower_l(*(unsigned char*)s2, locale)) return 1; \
-+ \
-+ s1++; s2++; n++; \
-+ } \
-+ }
-+
-+STRNCASECMP_L(VG_Z_LIBC_SONAME, strncasecmp_l)
-+#if defined(VGO_linux)
-+STRNCASECMP_L(VG_Z_LIBC_SONAME, __GI_strncasecmp_l)
-+#elif defined(VGO_darwin)
-+STRNCASECMP_L(VG_Z_DYLD, strncasecmp_l)
-+#endif
-+
-+
-+#endif
-+
-+
- #define STRCMP(soname, fnname) \
- int VG_REPLACE_FUNCTION_ZU(soname,fnname) \
- ( const char* s1, const char* s2 ); \
-Index: configure.in
-===================================================================
---- configure.in (revision 11477)
-+++ configure.in (revision 11478)
-@@ -1549,6 +1549,7 @@
- strstr \
- syscall \
- timerfd \
-+ tolower_l \
- utimensat \
- ])
-
Deleted: glibc-2.13.patch
===================================================================
--- glibc-2.13.patch 2011-02-17 12:11:03 UTC (rev 110183)
+++ glibc-2.13.patch 2011-02-17 12:26:47 UTC (rev 110184)
@@ -1,33 +0,0 @@
-diff -Naur valgrind-3.6.0-old//config.h.in valgrind-3.6.0/config.h.in
---- valgrind-3.6.0-old//config.h.in 2010-10-21 06:20:49.000000000 +1000
-+++ valgrind-3.6.0/config.h.in 2011-01-19 10:31:18.476673930 +1000
-@@ -33,6 +33,9 @@
- /* Define to 1 if you're using glibc 2.12.x */
- #undef GLIBC_2_12
-
-+/* Define to 1 if you're using glibc 2.13.x */
-+#undef GLIBC_2_13
-+
- /* Define to 1 if you're using glibc 2.2.x */
- #undef GLIBC_2_2
-
-diff -Naur valgrind-3.6.0-old//configure valgrind-3.6.0/configure
---- valgrind-3.6.0-old//configure 2010-10-21 11:16:18.000000000 +1000
-+++ valgrind-3.6.0/configure 2011-01-19 10:32:20.346673926 +1000
-@@ -6367,6 +6367,16 @@
- DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
- ;;
-+ 2.13)
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.13 family" >&5
-+$as_echo "2.13 family" >&6; }
-+
-+$as_echo "#define GLIBC_2_13 1" >>confdefs.h
-+
-+ 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}"
-+ ;;
- aix5)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: AIX 5.1 or 5.2 or 5.3" >&5
- $as_echo "AIX 5.1 or 5.2 or 5.3" >&6; }
More information about the arch-commits
mailing list