Accepting request 146725 from devel:tools

- Add valgrind-glibc-2.17.patch to fix compilation with glibc 2.17

OBS-URL: https://build.opensuse.org/request/show/146725
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/valgrind?expand=0&rev=73
This commit is contained in:
Ismail Dönmez 2012-12-31 13:26:48 +00:00 committed by Git OBS Bridge
commit 349189ad06
3 changed files with 37 additions and 0 deletions

30
valgrind-glibc-2.17.patch Normal file
View File

@ -0,0 +1,30 @@
Index: valgrind-3.8.1/configure
===================================================================
--- valgrind-3.8.1.orig/configure
+++ valgrind-3.8.1/configure
@@ -6604,6 +6604,16 @@ $as_echo "#define GLIBC_2_16 1" >>confde
DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
;;
+ 2.17)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.16 family" >&5
+$as_echo "2.17 family" >&6; }
+
+$as_echo "#define GLIBC_2_17 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}"
+ ;;
darwin)
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5
$as_echo "Darwin" >&6; }
@@ -6624,7 +6634,7 @@ $as_echo "#define BIONIC_LIBC 1" >>confd
*)
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported version ${GLIBC_VERSION}" >&5
$as_echo "unsupported version ${GLIBC_VERSION}" >&6; }
- as_fn_error "Valgrind requires glibc version 2.2 - 2.16" "$LINENO" 5
+ as_fn_error "Valgrind requires glibc version 2.2 - 2.17" "$LINENO" 5
as_fn_error "or Darwin libc" "$LINENO" 5
;;
esac

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Dec 31 09:12:06 UTC 2012 - idonmez@suse.com
- Add valgrind-glibc-2.17.patch to fix compilation with glibc 2.17
-------------------------------------------------------------------
Thu Oct 4 11:36:36 UTC 2012 - dmueller@suse.com

View File

@ -40,6 +40,7 @@ Source0: %{name}-%{version}.tar.bz2
# svn di svn://svn.valgrind.org/vex/tags/VEX_3_5_0 svn://svn.valgrind.org/vex/branches/VEX_3_5_BRANCH > VEX_3_5_BRANCH.diff
Patch1: jit-register-unregister.diff
Patch2: raise-segnames-limit.diff
Patch3: valgrind-glibc-2.17.patch
# during building the major version of glibc is built into the suppression file
%define glibc_main_version %(getconf GNU_LIBC_VERSION | cut -d' ' -f2 | cut -d. -f1)
%define glibc_major_version %(getconf GNU_LIBC_VERSION | cut -d' ' -f2 | cut -d. -f2)
@ -138,6 +139,7 @@ cd VEX
cd ..
%patch1
%patch2
%patch3 -p1
%build
%ifarch %arm