From 24db29949d2916a26d80299e71d1ddfafd31d463 Mon Sep 17 00:00:00 2001 From: Jacek Konieczny Date: Mon, 23 Jan 2012 11:37:49 +0000 Subject: [PATCH] - Valgrind insisted on redirecting the 'strlen' symbol in /lib/ld-linux.so.2, but it seem the symbol is not there on i686 PLD. valgrind-ld_linux_strlen.patch makes this redirection optional. Changed files: valgrind-ld_linux_strlen.patch -> 1.1 valgrind.spec -> 1.86 --- valgrind-ld_linux_strlen.patch | 11 +++++++++++ valgrind.spec | 2 ++ 2 files changed, 13 insertions(+) create mode 100644 valgrind-ld_linux_strlen.patch diff --git a/valgrind-ld_linux_strlen.patch b/valgrind-ld_linux_strlen.patch new file mode 100644 index 0000000..2ebeea2 --- /dev/null +++ b/valgrind-ld_linux_strlen.patch @@ -0,0 +1,11 @@ +--- valgrind-3.7.0/coregrind/m_redir.c.orig 2012-01-23 12:29:24.000000000 +0100 ++++ valgrind-3.7.0/coregrind/m_redir.c 2012-01-23 12:29:47.000000000 +0100 +@@ -1082,7 +1082,7 @@ + (Addr)&VG_(x86_linux_REDIR_FOR_index), mandatory); + add_hardwired_spec( + "ld-linux.so.2", "strlen", +- (Addr)&VG_(x86_linux_REDIR_FOR_strlen), mandatory); ++ (Addr)&VG_(x86_linux_REDIR_FOR_strlen), NULL); + } + + # elif defined(VGP_amd64_linux) diff --git a/valgrind.spec b/valgrind.spec index 761f413..75e9bb3 100644 --- a/valgrind.spec +++ b/valgrind.spec @@ -12,6 +12,7 @@ Source0: http://valgrind.org/downloads/%{name}-%{version}.tar.bz2 Patch0: %{name}-debuginfo.patch Patch1: %{name}-native-cpuid.patch Patch2: %{name}-automake-1.11.2.patch +Patch3: %{name}-ld_linux_strlen.patch URL: http://valgrind.org/ BuildRequires: autoconf BuildRequires: automake @@ -52,6 +53,7 @@ pracować. %patch0 %patch1 -p1 %patch2 -p0 +%patch3 -p1 sed -i -e 's:^CFLAGS="-Wno-long-long":CFLAGS="$CFLAGS -Wno-long-long":' configure.in -- 2.43.0