From 084c175e59e9ea61c68154ad9982adcd918cbfcf Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 14 Oct 2010 00:21:10 +0200
Subject: make MacOS X works as build system for most of the packages, update
 some packages to latest stable upstream version

---
 package/valgrind/Makefile                |  1 +
 package/valgrind/patches/patch-configure | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 13 deletions(-)

(limited to 'package/valgrind')

diff --git a/package/valgrind/Makefile b/package/valgrind/Makefile
index ffc76e9c3..9d43be1d2 100644
--- a/package/valgrind/Makefile
+++ b/package/valgrind/Makefile
@@ -13,6 +13,7 @@ PKG_URL:=		http://valgrind.org/
 PKG_SITES:=		http://valgrind.org/downloads/
 
 PKG_TARGET_DEPENDS:=	x86 x86_64
+PKG_HOST_DEPENDS:=	!darwin
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
diff --git a/package/valgrind/patches/patch-configure b/package/valgrind/patches/patch-configure
index d82a3ffa9..b0167622f 100644
--- a/package/valgrind/patches/patch-configure
+++ b/package/valgrind/patches/patch-configure
@@ -1,5 +1,5 @@
 --- valgrind-3.5.0.orig/configure	2009-08-19 15:44:07.000000000 +0200
-+++ valgrind-3.5.0/configure	2010-04-03 09:55:06.363473068 +0200
++++ valgrind-3.5.0/configure	2010-10-11 22:01:23.000000000 +0200
 @@ -4215,7 +4215,7 @@ echo "${ECHO_T}ok (${host_os})" >&6
          echo "$as_me:$LINENO: checking for the kernel version" >&5
  echo $ECHO_N "checking for the kernel version... $ECHO_C" >&6
@@ -22,15 +22,15 @@
 +
 +#include <features.h>
 +#ifdef __GNU_LIBRARY__
-+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 11)
-+  GLIBC_211
++ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 12)
++  GLIBC_212
 + #endif
 +#endif
 +
 +_ACEOF
 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "GLIBC_211" >/dev/null 2>&1; then
-+  libc="2.11"
++  $EGREP "GLIBC_212" >/dev/null 2>&1; then
++  libc="2.12"
 +fi
 +rm -f conftest*
 +
@@ -43,8 +43,8 @@
  #ifdef __GNU_LIBRARY__
 - #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 10)
 -  GLIBC_210
-+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 11)
-+  GLIBC_211
++ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 12)
++  GLIBC_212
   #endif
  #endif
  
@@ -52,8 +52,8 @@
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 -  $EGREP "GLIBC_210" >/dev/null 2>&1; then
 -  GLIBC_VERSION="2.10"
-+  $EGREP "GLIBC_211" >/dev/null 2>&1; then
-+  GLIBC_VERSION="2.11"
++  $EGREP "GLIBC_212" >/dev/null 2>&1; then
++  GLIBC_VERSION="2.12"
  fi
  rm -f conftest*
  
@@ -61,12 +61,12 @@
  	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
++     2.12*)
++	echo "$as_me:$LINENO: result: 2.12 family" >&5
++echo "${ECHO_T}2.12 family" >&6
 +
 +cat >>confdefs.h <<\_ACEOF
-+#define GLIBC_2_11 1
++#define GLIBC_2_12 1
 +_ACEOF
 +
 +	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
-- 
cgit v1.2.3