fix building against IBM DB2, you now can use your DB2_HOME env variable again (bug #337512, thanks reavertm for the patch)

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 17 insertions, 8 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index 679b80120c25..ea50c1d45808 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/php
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.417 2010/09/07 21:22:40 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.418 2010/09/19 15:15:08 mabi Exp $
+
+  19 Sep 2010; Matti Bickel <mabi@gentoo.org>
+  files/eblits/src_configure-v1.eblit, files/eblits/src_configure-v52.eblit:
+  fix building against IBM DB2, you now can use your DB2_HOME env variable
+  again (bug #337512, thanks reavertm for the patch)
 
   07 Sep 2010; Matti Bickel <mabi@gentoo.org> php-5.2.14.ebuild:
   enable spl and reflection by default, following upstream (bug #310383)
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 5975f2686c8b..695451ced02b 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -7,8 +7,8 @@ AUX eblits/common-v1.eblit 376 RMD160 524d38035ef01b215c6dc06699c41550c246de9d S
 AUX eblits/pkg_postinst-v1.eblit 2184 RMD160 ce65ba811eab10862d067c7e2b4bdc8d2b0aee56 SHA1 11c14f2235041cfb08e33cf2550bebef2037e92b SHA256 9e1cd81be4f051f3156de0ce5398a338b2ab6f8e73047c5983beda47f2f762b0
 AUX eblits/pkg_setup-v1.eblit 777 RMD160 aa63e7ab1bae34feffbbfaae902f11c6e797ba9d SHA1 f7334a4750b1a1bb2f24021dff884733a88ac347 SHA256 2613f51ee9e3a258dbab38ff2df724f2971a50a5ad8c097cb5a4e3744df5fc8a
 AUX eblits/src_compile-v1.eblit 1283 RMD160 83fbb374e2dfaa9d164e6b32b57c268ed06bf519 SHA1 09124cbc9008bfb72eb24cd24b2319d22df52c2c SHA256 5ec76ae24304c5f803a615a98394c219018da1b1ce2018f92f6ac8c5becf6c99
-AUX eblits/src_configure-v1.eblit 10849 RMD160 500822ece89b530d7fa9e1b19726d551960c9485 SHA1 4a309331ad8a6104ece12a609f567ce978fd21b2 SHA256 d39bb9e67f5e7fd6f8ad30d94abfa80da1f9cc0bb030d5caa4cb543dd3b88577
-AUX eblits/src_configure-v52.eblit 10888 RMD160 bcf10bc22460deac5b899350f0c77c726394b330 SHA1 d74aa51543383a802a01149721a9469cd11eac64 SHA256 4b7901c0ca02d0cfec1b591bbdd7d8157c53fe844f92d927d356c8739edd2929
+AUX eblits/src_configure-v1.eblit 10978 RMD160 5cd978ef123771d00c9ddedcf130359ce07744c1 SHA1 7f024d82b08abcda59c4efe73617ca85531fb838 SHA256 e8885fd590903a5d9d2f775a161a351dbe0b9e1dfac959f2c1a9b0af65532990
+AUX eblits/src_configure-v52.eblit 11017 RMD160 4a804e4b021d2454c81c33644a744b72eec1e65d SHA1 f30392f1727592ad5de79934042d9d0b09c4ba41 SHA256 784ec5482362cc8f0725ca30a186e08958d7e8e752a238af043cfa8c7a68ed85
 AUX eblits/src_install-v1.eblit 5021 RMD160 39e8103e1aec27587b03100ce58e64922b119a79 SHA1 9c7d72ca8311c63013216c3ce3c50621aaba79f8 SHA256 f3e056e582d6eee4ce5cae8a62431c73719e57ee475d9531a9004aee2a12e28d
 AUX eblits/src_prepare-v1.eblit 2616 RMD160 ccff64d09cc90ada1ea5d1311457cf9a05f12f8e SHA1 7db40d0ca7ef01e5b61962f261511803f768f1bc SHA256 915b9755a37f7670f6e436fe5072dae8f5e6b437ccdfbff835e26bb2f9d22b1e
 AUX eblits/src_test-v1.eblit 1530 RMD160 10031a5128dab729106c6fbfe4e899b1583818cb SHA1 0f1abf995913c2c381e2496b8670ea4f6e97964b SHA256 67501925cfdaf9043e4985d0f1c797e62fb42bf47e6863b5ffdecb104888e82c
@@ -29,5 +29,5 @@ DIST suhosin-patch-5.3.3-0.9.10.patch.gz 41298 RMD160 8dcd8b51ea0357b6cc51e70e49
 EBUILD php-5.2.13.ebuild 16859 RMD160 e899ea551626ec77614931e052189a51b52cac5f SHA1 9092d7dd5eb208954096f67df1a36eef8be37ffa SHA256 95e359d899c9e42e358789029e535a4b54d8ab428a3c83503e0964831ed1775d
 EBUILD php-5.2.14.ebuild 9164 RMD160 893778d74f25ee5a0f1310be970499152102c7f6 SHA1 4f82548143854bcb759eda79a040b40d160408c3 SHA256 0c91e2a72176d103d377f328af20f759fd087ebb00e761b28d3fc372dfb09a59
 EBUILD php-5.3.3-r1.ebuild 9495 RMD160 4a83ee70121196dee97e416dea2507b6174003fd SHA1 d7b74de403cabf6c58452f65729e140c9c8e794f SHA256 835f3310852b8aaf9e13b0d368409c6030e39017e6ce7a993b31bc668550dff3
-MISC ChangeLog 71700 RMD160 6fa8486d1f5435051f05b71708a7c800686683bf SHA1 f34d31ec9182e4b5c637c8362ad4a22bdd0aa3c9 SHA256 53a956d2e41d6cf402f2f0aca85026984371f9214e90f1a312b7a0bb9eb1a05a
+MISC ChangeLog 71952 RMD160 666a8b18cfb6264e529a01c9293eb94312897338 SHA1 d848892e2a49f16f8c4d781ea3bbc065d3c1d00d SHA256 62c02b26c078de63a256216288386eedca214bcd5a3bf0cdb987b589c2598298
 MISC metadata.xml 2251 RMD160 4167b367fe5472e090fec27c09a465e558b8caf9 SHA1 059e3863cc1e500cf438f12ca98fe7f4ebd24722 SHA256 f402e3753e18c32922a694ab1bbde615754f26bbebc401b90b18f57bf5e49342
diff --git a/dev-lang/php/files/eblits/src_configure-v1.eblit b/dev-lang/php/files/eblits/src_configure-v1.eblit
index 64f077bdb464..de33d69276e8 100644
--- a/dev-lang/php/files/eblits/src_configure-v1.eblit
+++ b/dev-lang/php/files/eblits/src_configure-v1.eblit
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_configure-v1.eblit,v 1.6 2010/08/09 13:02:23 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_configure-v1.eblit,v 1.7 2010/09/19 15:15:08 mabi Exp $
 
 eblit-php-src_configure() {
 	PHP_DESTDIR="/usr/$(get_libdir)/php${PHP_MV}"
@@ -154,7 +154,9 @@ eblit-php-src_configure() {
 			phpconfutils_extension_with "empress-bcs" "empress-bcs" 0
 		fi
 		phpconfutils_extension_with "esoob"   "esoob" 1
-		phpconfutils_extension_with "ibm-db2" "db2"   1
+		# Needed to run conftest for IBM DB2
+		[[ -n ${DB2_HOME} ]] && export LD_LIBRARY_PATH="${DB2_HOME}/`get_libdir`"
+		phpconfutils_extension_with "ibm-db2" "db2"   1 "${DB2_HOME}"
 		phpconfutils_extension_with "sapdb"   "sapdb" 1
 		phpconfutils_extension_with "solid"   "solid" 1
 	fi
diff --git a/dev-lang/php/files/eblits/src_configure-v52.eblit b/dev-lang/php/files/eblits/src_configure-v52.eblit
index 21ca863d9173..73feceafca38 100644
--- a/dev-lang/php/files/eblits/src_configure-v52.eblit
+++ b/dev-lang/php/files/eblits/src_configure-v52.eblit
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_configure-v52.eblit,v 1.4 2010/08/11 22:30:23 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_configure-v52.eblit,v 1.5 2010/09/19 15:15:08 mabi Exp $
 
 eblit-php-src_configure() {
 	export CFLAGS="${CFLAGS} -D_GNU_SOURCE"
@@ -149,7 +149,9 @@ eblit-php-src_configure() {
 			phpconfutils_extension_with "empress-bcs" "empress-bcs" 0
 		fi
 		phpconfutils_extension_with "esoob"   "esoob" 1
-		phpconfutils_extension_with "ibm-db2" "db2"   1
+		# Needed to run conftest for IBM DB2
+		[[ -n ${DB2_HOME} ]] && export LD_LIBRARY_PATH="${DB2_HOME}/`get_libdir`"
+		phpconfutils_extension_with "ibm-db2" "db2"   1 "${DB2_HOME}"
 		phpconfutils_extension_with "sapdb"   "sapdb" 1
 		phpconfutils_extension_with "solid"   "solid" 1
 	fi