You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
134 lines
4.5 KiB
134 lines
4.5 KiB
# --- SDE-COPYRIGHT-NOTE-BEGIN --- |
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|
# |
|
# Filename: package/.../valgrind/valgrind-3.5.0-glibc-2.11.patch |
|
# Copyright (C) 2010 The OpenSDE Project |
|
# |
|
# More information can be found in the files COPYING and README. |
|
# |
|
# This patch file is dual-licensed. It is available under the license the |
|
# patched project is licensed under, as long as it is an OpenSource license |
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
|
# of the GNU General Public License as published by the Free Software |
|
# Foundation; either version 2 of the License, or (at your option) any later |
|
# version. |
|
# --- SDE-COPYRIGHT-NOTE-END --- |
|
|
|
Description: Accept to build valgrind 3.50 against glibc 2.11 |
|
Origin: http://pkgs.fedoraproject.org/gitweb/?p=valgrind.git;a=tree |
|
|
|
--- valgrind/configure.in.jj 2009-08-19 15:37:48.000000000 +0200 |
|
+++ valgrind/configure.in 2009-11-04 08:37:09.820077680 +0100 |
|
@@ -656,6 +656,16 @@ AC_EGREP_CPP([GLIBC_210], [ |
|
], |
|
GLIBC_VERSION="2.10") |
|
|
|
+AC_EGREP_CPP([GLIBC_211], [ |
|
+#include <features.h> |
|
+#ifdef __GNU_LIBRARY__ |
|
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 11) |
|
+ GLIBC_211 |
|
+ #endif |
|
+#endif |
|
+], |
|
+GLIBC_VERSION="2.11") |
|
+ |
|
AC_EGREP_CPP([AIX5_LIBC], [ |
|
#include <standards.h> |
|
#if defined(_AIXVERSION_510) || defined(_AIXVERSION_520) || defined(_AIXVERSION_530) |
|
@@ -742,6 +752,13 @@ case "${GLIBC_VERSION}" in |
|
DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" |
|
DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" |
|
;; |
|
+ 2.11) |
|
+ AC_MSG_RESULT(2.11 family) |
|
+ AC_DEFINE([GLIBC_2_11], 1, [Define to 1 if you're using glibc 2.11.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}" |
|
+ ;; |
|
aix5) |
|
AC_MSG_RESULT(AIX 5.1 or 5.2 or 5.3) |
|
AC_DEFINE([AIX5_LIBC], 1, [Define to 1 if you're using AIX 5.1 or 5.2 or 5.3]) |
|
@@ -755,7 +772,7 @@ case "${GLIBC_VERSION}" in |
|
|
|
*) |
|
AC_MSG_RESULT(unsupported version) |
|
- AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.10]) |
|
+ AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.11]) |
|
AC_MSG_ERROR([or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION]) |
|
AC_MSG_ERROR([or Darwin libc]) |
|
;; |
|
--- valgrind/config.h.in.jj 2009-08-19 15:39:05.000000000 +0200 |
|
+++ valgrind/config.h.in 2009-11-04 08:38:36.051072661 +0100 |
|
@@ -15,6 +15,9 @@ |
|
/* Define to 1 if you're using glibc 2.10.x */ |
|
#undef GLIBC_2_10 |
|
|
|
+/* Define to 1 if you're using glibc 2.11.x */ |
|
+#undef GLIBC_2_11 |
|
+ |
|
/* Define to 1 if you're using glibc 2.2.x */ |
|
#undef GLIBC_2_2 |
|
|
|
--- valgrind/configure.jj 2009-08-19 15:44:07.000000000 +0200 |
|
+++ valgrind/configure 2009-11-04 08:38:08.421433252 +0100 |
|
@@ -5025,6 +5025,28 @@ cat confdefs.h >>conftest.$ac_ext |
|
cat >>conftest.$ac_ext <<_ACEOF |
|
/* end confdefs.h. */ |
|
|
|
+#include <features.h> |
|
+#ifdef __GNU_LIBRARY__ |
|
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 11) |
|
+ GLIBC_211 |
|
+ #endif |
|
+#endif |
|
+ |
|
+_ACEOF |
|
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | |
|
+ $EGREP "GLIBC_211" >/dev/null 2>&1; then |
|
+ GLIBC_VERSION="2.11" |
|
+fi |
|
+rm -f conftest* |
|
+ |
|
+ |
|
+cat >conftest.$ac_ext <<_ACEOF |
|
+/* confdefs.h. */ |
|
+_ACEOF |
|
+cat confdefs.h >>conftest.$ac_ext |
|
+cat >>conftest.$ac_ext <<_ACEOF |
|
+/* end confdefs.h. */ |
|
+ |
|
#include <standards.h> |
|
#if defined(_AIXVERSION_510) || defined(_AIXVERSION_520) || defined(_AIXVERSION_530) |
|
AIX5_LIBC |
|
@@ -5174,6 +5196,18 @@ _ACEOF |
|
DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" |
|
DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" |
|
;; |
|
+ 2.11) |
|
+ echo "$as_me:$LINENO: result: 2.11 family" >&5 |
|
+echo "${ECHO_T}2.11 family" >&6 |
|
+ |
|
+cat >>confdefs.h <<\_ACEOF |
|
+#define GLIBC_2_11 1 |
|
+_ACEOF |
|
+ |
|
+ 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) |
|
echo "$as_me:$LINENO: result: AIX 5.1 or 5.2 or 5.3" >&5 |
|
echo "${ECHO_T}AIX 5.1 or 5.2 or 5.3" >&6 |
|
@@ -5198,8 +5232,8 @@ _ACEOF |
|
*) |
|
echo "$as_me:$LINENO: result: unsupported version" >&5 |
|
echo "${ECHO_T}unsupported version" >&6 |
|
- { { echo "$as_me:$LINENO: error: Valgrind requires glibc version 2.2 - 2.10" >&5 |
|
-echo "$as_me: error: Valgrind requires glibc version 2.2 - 2.10" >&2;} |
|
+ { { echo "$as_me:$LINENO: error: Valgrind requires glibc version 2.2 - 2.11" >&5 |
|
+echo "$as_me: error: Valgrind requires glibc version 2.2 - 2.11" >&2;} |
|
{ (exit 1); exit 1; }; } |
|
{ { echo "$as_me:$LINENO: error: or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION" >&5 |
|
echo "$as_me: error: or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION" >&2;}
|
|
|