rpms/valgrind
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Recognize glibc 2.20 final. valgrind-3.10-configure-glibc-2.20.patch

Browse Source
This commit is contained in:
Mark Wielaard 2014-09-09 09:38:54 +02:00
parent 77e41c7ce1
commit 1e1bb14fd4
2 changed files with 57 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
valgrind-3.10-configure-glibc-2.20.patch Normal file
View File

@ -0,0 +1,52 @@
Only in valgrind-3.10.0.BETA2: autom4te.cache
diff -ur valgrind-3.10.0.BETA2.orig/config.h.in valgrind-3.10.0.BETA2/config.h.in
--- valgrind-3.10.0.BETA2.orig/config.h.in 2014-09-09 09:17:54.112654934 +0200
+++ valgrind-3.10.0.BETA2/config.h.in 2014-09-09 09:35:38.000000000 +0200
@@ -66,6 +66,9 @@
/* Define to 1 if you're using glibc 2.2.x */
#undef GLIBC_2_2
+/* Define to 1 if you're using glibc 2.20.x */
+#undef GLIBC_2_20
+
/* Define to 1 if you're using glibc 2.3.x */
#undef GLIBC_2_3
Only in valgrind-3.10.0.BETA2: config.h.in~
diff -ur valgrind-3.10.0.BETA2.orig/configure valgrind-3.10.0.BETA2/configure
--- valgrind-3.10.0.BETA2.orig/configure 2014-09-09 09:17:54.106654950 +0200
+++ valgrind-3.10.0.BETA2/configure 2014-09-09 09:35:43.280624261 +0200
@@ -6828,6 +6828,16 @@
DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
;;
+ 2.20)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.20 family" >&5
+$as_echo "2.20 family" >&6; }
+
+$as_echo "#define GLIBC_2_20 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; }
diff -ur valgrind-3.10.0.BETA2.orig/configure.ac valgrind-3.10.0.BETA2/configure.ac
--- valgrind-3.10.0.BETA2.orig/configure.ac 2014-09-09 09:17:54.132654881 +0200
+++ valgrind-3.10.0.BETA2/configure.ac 2014-09-09 09:33:31.944021414 +0200
@@ -1008,6 +1008,13 @@
DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
;;
+ 2.20)
+ AC_MSG_RESULT(2.20 family)
+ AC_DEFINE([GLIBC_2_20], 1, [Define to 1 if you're using glibc 2.20.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])

5
valgrind.spec
View File

@ -48,6 +48,9 @@ Patch3: valgrind-3.9.0-stat_h.patch
# Make ld.so supressions slightly less specific. # Make ld.so supressions slightly less specific.
Patch4: valgrind-3.9.0-ldso-supp.patch Patch4: valgrind-3.9.0-ldso-supp.patch
# Recognize glibc 2.20 final. Upstream valgrind svn r14505.
Patch5: valgrind-3.10-configure-glibc-2.20.patch
%if %{build_multilib} %if %{build_multilib}
# Ensure glibc{,-devel} is installed for both multilib arches # Ensure glibc{,-devel} is installed for both multilib arches
BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc.so BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc.so
@ -150,6 +153,7 @@ Valgrind User Manual for details.
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p1
%build %build
# We need to use the software collection compiler and binutils if available. # We need to use the software collection compiler and binutils if available.
@ -306,6 +310,7 @@ echo ===============END TESTING===============
- Update to 3.10.0.BETA2. - Update to 3.10.0.BETA2.
- Don't run dwz or generate minisymtab. - Don't run dwz or generate minisymtab.
- Remove valgrind-3.9.0-s390x-ld-supp.patch fixed upstream. - Remove valgrind-3.9.0-s390x-ld-supp.patch fixed upstream.
- Add valgrind-3.10-configure-glibc-2.20.patch.
* Tue Sep 2 2014 Mark Wielaard <mjw@redhat.com> - 3.10.0-0.1.BETA1 * Tue Sep 2 2014 Mark Wielaard <mjw@redhat.com> - 3.10.0-0.1.BETA1
- Update to official upstream 3.10.0 BETA1. - Update to official upstream 3.10.0 BETA1.