Fix build failure with USE=debug and valgrind >= 3.4 (bug #284396,

  thanks to Michael B for the report, and thanks to Nick Lockwood
  for backporting patch from latest firebird upstream)
(Portage version: 2.1.6.13/cvs/Linux x86_64)

5 files changed, 42 insertions, 10 deletions

diff --git a/dev-db/firebird/ChangeLog b/dev-db/firebird/ChangeLog
index b3409ac1008b..0465e36b3c9f 100644
--- a/dev-db/firebird/ChangeLog
+++ b/dev-db/firebird/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/firebird
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.100 2009/09/17 20:15:39 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.101 2009/10/04 21:13:52 wormo Exp $
+
+  04 Oct 2009; Stephanie Lockwood-Childs <wormo@gentoo.org>
+  +files/firebird-update-valgrind.patch, firebird-2.1.1.17910.0.ebuild,
+  firebird-2.1.2.18118.0.ebuild, firebird-2.1.3.18185.0.ebuild:
+  Fix build failure with USE=debug and valgrind >= 3.4 (bug #284396,
+  thanks to Michael B for the report, and thanks to Nick Lockwood 
+  for backporting patch from latest firebird upstream)
 
 *firebird-2.1.3.18185.0 (17 Sep 2009)
 
diff --git a/dev-db/firebird/files/firebird-update-valgrind.patch b/dev-db/firebird/files/firebird-update-valgrind.patch
new file mode 100644
index 000000000000..7f8eab1b802f
--- /dev/null
+++ b/dev-db/firebird/files/firebird-update-valgrind.patch
@@ -0,0 +1,16 @@
+--- src.old/common/classes/alloc.cpp 2009-08-20 09:41:15.000000000 -0700
++++ src/common/classes/alloc.cpp   2009-08-19 21:47:10.000000000 -0700
+@@ -42,7 +42,11 @@
+
+ #ifdef USE_VALGRIND
+ #include <valgrind/memcheck.h>
+-#endif
++#ifndef VALGRIND_MAKE_WRITABLE // VALGRIND 3.3
++#define VALGRIND_MAKE_WRITABLE VALGRIND_MAKE_MEM_UNDEFINED
++#define VALGRIND_MAKE_NOACCESS VALGRIND_MAKE_MEM_NOACCESS
++#endif  // VALGRIND 3.3
++#endif  // USE_VALGRIND
+
+ // Fill blocks with patterns
+ #define FREE_PATTERN 0xDEADBEEF
+
diff --git a/dev-db/firebird/firebird-2.1.1.17910.0.ebuild b/dev-db/firebird/firebird-2.1.1.17910.0.ebuild
index 1a4f0677a3c4..3222ba0e0376 100644
--- a/dev-db/firebird/firebird-2.1.1.17910.0.ebuild
+++ b/dev-db/firebird/firebird-2.1.1.17910.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.1.1.17910.0.ebuild,v 1.3 2009/08/13 17:38:10 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.1.1.17910.0.ebuild,v 1.4 2009/10/04 21:13:52 wormo Exp $
 
 inherit flag-o-matic eutils autotools versionator
 
@@ -122,6 +122,9 @@ src_unpack() {
 
 	epatch "${FILESDIR}/${P}-gcc-icu-declare.patch"
 
+	# allow debug to use valgrind 3.4 (instead of obsolete valgrind 3.3)
+	epatch "${FILESDIR}/${PN}-update-valgrind.patch"
+
 	eautoreconf
 }
 
diff --git a/dev-db/firebird/firebird-2.1.2.18118.0.ebuild b/dev-db/firebird/firebird-2.1.2.18118.0.ebuild
index 0aa34d82a43a..9c6527ef3f9d 100644
--- a/dev-db/firebird/firebird-2.1.2.18118.0.ebuild
+++ b/dev-db/firebird/firebird-2.1.2.18118.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.1.2.18118.0.ebuild,v 1.1 2009/09/17 19:55:01 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.1.2.18118.0.ebuild,v 1.2 2009/10/04 21:13:52 wormo Exp $
 
 inherit flag-o-matic eutils autotools versionator
 
@@ -117,10 +117,13 @@ src_unpack() {
 		-e 's:ISQL :FBSQL :w /dev/stdout' \
 		src/msgs/messages2.sql | wc -l)" "6" "src/msgs/messages2.sql" # 6 lines
 
-    find "${S}" -name \*.sh -print0 | xargs -0 chmod +x
-    rm -rf "${S}"/extern/{editline,icu}
+	find "${S}" -name \*.sh -print0 | xargs -0 chmod +x
+	rm -rf "${S}"/extern/{editline,icu}
 
-    epatch "${FILESDIR}/${P}-gcc-icu-declare.patch"
+	epatch "${FILESDIR}/${P}-gcc-icu-declare.patch"
+
+	# allow debug to use valgrind 3.4 (instead of obsolete valgrind 3.3)
+	epatch "${FILESDIR}/${PN}-update-valgrind.patch"
 
 	eautoreconf
 }
diff --git a/dev-db/firebird/firebird-2.1.3.18185.0.ebuild b/dev-db/firebird/firebird-2.1.3.18185.0.ebuild
index 7cdbf7bf0ca0..17a4b87db0cd 100644
--- a/dev-db/firebird/firebird-2.1.3.18185.0.ebuild
+++ b/dev-db/firebird/firebird-2.1.3.18185.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.1.3.18185.0.ebuild,v 1.1 2009/09/17 20:15:39 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.1.3.18185.0.ebuild,v 1.2 2009/10/04 21:13:52 wormo Exp $
 
 inherit flag-o-matic eutils autotools versionator
 
@@ -117,10 +117,13 @@ src_unpack() {
 		-e 's:ISQL :FBSQL :w /dev/stdout' \
 		src/msgs/messages2.sql | wc -l)" "6" "src/msgs/messages2.sql" # 6 lines
 
-    find "${S}" -name \*.sh -print0 | xargs -0 chmod +x
-    rm -rf "${S}"/extern/{editline,icu}
+	find "${S}" -name \*.sh -print0 | xargs -0 chmod +x
+	rm -rf "${S}"/extern/{editline,icu}
 
-    epatch "${FILESDIR}/${PN}-2.1.2.18118.0-gcc-icu-declare.patch"
+	epatch "${FILESDIR}/${PN}-2.1.2.18118.0-gcc-icu-declare.patch"
+
+	# allow debug to use valgrind 3.4 (instead of obsolete valgrind 3.3)
+	epatch "${FILESDIR}/${PN}-update-valgrind.patch"
 
 	eautoreconf
 }