| 1 |
ssuominen 10/08/19 17:58:17 |
| 2 |
|
| 3 |
Added: valgrind-3.5.0-stat_h.patch |
| 4 |
valgrind-3.5.0-glibc-2.12.patch |
| 5 |
Log: |
| 6 |
Fix building with recent glibc wrt #332871 by Michal Vaner. |
| 7 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-util/valgrind/files/valgrind-3.5.0-stat_h.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/valgrind/files/valgrind-3.5.0-stat_h.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/valgrind/files/valgrind-3.5.0-stat_h.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: valgrind-3.5.0-stat_h.patch |
| 16 |
=================================================================== |
| 17 |
http://cvs.fedoraproject.org/viewvc/rpms/valgrind/devel/valgrind-3.5.0-stat_h.patch?view=log |
| 18 |
|
| 19 |
--- include/vki/vki-amd64-linux.h |
| 20 |
+++ include/vki/vki-amd64-linux.h |
| 21 |
@@ -310,6 +310,9 @@ struct vki_stat { |
| 22 |
long st_blksize; |
| 23 |
long st_blocks; /* Number 512-byte blocks allocated. */ |
| 24 |
|
| 25 |
+#undef st_atime |
| 26 |
+#undef st_mtime |
| 27 |
+#undef st_ctime |
| 28 |
unsigned long st_atime; |
| 29 |
unsigned long st_atime_nsec; |
| 30 |
unsigned long st_mtime; |
| 31 |
--- include/vki/vki-x86-linux.h |
| 32 |
+++ include/vki/vki-x86-linux.h |
| 33 |
@@ -348,6 +348,9 @@ struct vki_stat { |
| 34 |
unsigned long st_size; |
| 35 |
unsigned long st_blksize; |
| 36 |
unsigned long st_blocks; |
| 37 |
+#undef st_atime |
| 38 |
+#undef st_mtime |
| 39 |
+#undef st_ctime |
| 40 |
unsigned long st_atime; |
| 41 |
unsigned long st_atime_nsec; |
| 42 |
unsigned long st_mtime; |
| 43 |
--- include/vki/vki-ppc32-linux.h |
| 44 |
+++ include/vki/vki-ppc32-linux.h |
| 45 |
@@ -392,6 +392,9 @@ struct vki_stat { |
| 46 |
long st_size; |
| 47 |
unsigned long st_blksize; |
| 48 |
unsigned long st_blocks; |
| 49 |
+#undef st_atime |
| 50 |
+#undef st_mtime |
| 51 |
+#undef st_ctime |
| 52 |
unsigned long st_atime; |
| 53 |
unsigned long st_atime_nsec; |
| 54 |
unsigned long st_mtime; |
| 55 |
--- include/vki/vki-ppc64-linux.h |
| 56 |
+++ include/vki/vki-ppc64-linux.h |
| 57 |
@@ -428,6 +428,9 @@ struct vki_stat { |
| 58 |
long st_size; |
| 59 |
unsigned long st_blksize; |
| 60 |
unsigned long st_blocks; |
| 61 |
+#undef st_atime |
| 62 |
+#undef st_mtime |
| 63 |
+#undef st_ctime |
| 64 |
unsigned long st_atime; |
| 65 |
unsigned long st_atime_nsec; |
| 66 |
unsigned long st_mtime; |
| 67 |
|
| 68 |
|
| 69 |
|
| 70 |
1.1 dev-util/valgrind/files/valgrind-3.5.0-glibc-2.12.patch |
| 71 |
|
| 72 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/valgrind/files/valgrind-3.5.0-glibc-2.12.patch?rev=1.1&view=markup |
| 73 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/valgrind/files/valgrind-3.5.0-glibc-2.12.patch?rev=1.1&content-type=text/plain |
| 74 |
|
| 75 |
Index: valgrind-3.5.0-glibc-2.12.patch |
| 76 |
=================================================================== |
| 77 |
http://cvs.fedoraproject.org/viewvc/rpms/valgrind/devel/valgrind-3.5.0-glibc-2.12.patch?view=log |
| 78 |
|
| 79 |
--- configure.in |
| 80 |
+++ configure.in |
| 81 |
@@ -666,6 +666,16 @@ AC_EGREP_CPP([GLIBC_211], [ |
| 82 |
], |
| 83 |
GLIBC_VERSION="2.11") |
| 84 |
|
| 85 |
+AC_EGREP_CPP([GLIBC_212], [ |
| 86 |
+#include <features.h> |
| 87 |
+#ifdef __GNU_LIBRARY__ |
| 88 |
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 12) |
| 89 |
+ GLIBC_212 |
| 90 |
+ #endif |
| 91 |
+#endif |
| 92 |
+], |
| 93 |
+GLIBC_VERSION="2.12") |
| 94 |
+ |
| 95 |
AC_EGREP_CPP([AIX5_LIBC], [ |
| 96 |
#include <standards.h> |
| 97 |
#if defined(_AIXVERSION_510) || defined(_AIXVERSION_520) || defined(_AIXVERSION_530) |
| 98 |
@@ -759,6 +769,13 @@ case "${GLIBC_VERSION}" in |
| 99 |
DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" |
| 100 |
DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" |
| 101 |
;; |
| 102 |
+ 2.12) |
| 103 |
+ AC_MSG_RESULT(2.12 family) |
| 104 |
+ AC_DEFINE([GLIBC_2_12], 1, [Define to 1 if you're using glibc 2.12.x]) |
| 105 |
+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" |
| 106 |
+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" |
| 107 |
+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" |
| 108 |
+ ;; |
| 109 |
aix5) |
| 110 |
AC_MSG_RESULT(AIX 5.1 or 5.2 or 5.3) |
| 111 |
AC_DEFINE([AIX5_LIBC], 1, [Define to 1 if you're using AIX 5.1 or 5.2 or 5.3]) |
| 112 |
@@ -772,7 +789,7 @@ case "${GLIBC_VERSION}" in |
| 113 |
|
| 114 |
*) |
| 115 |
AC_MSG_RESULT(unsupported version) |
| 116 |
- AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.11]) |
| 117 |
+ AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.12]) |
| 118 |
AC_MSG_ERROR([or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION]) |
| 119 |
AC_MSG_ERROR([or Darwin libc]) |
| 120 |
;; |
| 121 |
--- config.h.in |
| 122 |
+++ config.h.in |
| 123 |
@@ -18,6 +18,9 @@ |
| 124 |
/* Define to 1 if you're using glibc 2.11.x */ |
| 125 |
#undef GLIBC_2_11 |
| 126 |
|
| 127 |
+/* Define to 1 if you're using glibc 2.12.x */ |
| 128 |
+#undef GLIBC_2_12 |
| 129 |
+ |
| 130 |
/* Define to 1 if you're using glibc 2.2.x */ |
| 131 |
#undef GLIBC_2_2 |
Archives