summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Loeser <halcy0n@gentoo.org>2009-07-25 22:15:29 +0000
committerMark Loeser <halcy0n@gentoo.org>2009-07-25 22:15:29 +0000
commitde887da1ece85cf4c8429e39ef77f384ed43ae10 (patch)
treeb6f3b224ff1602e8dafdc0209021232564da253c /dev-php5
parentFix building with GCC 4.4 wrt #274219. (diff)
downloadgentoo-2-de887da1ece85cf4c8429e39ef77f384ed43ae10.tar.gz
gentoo-2-de887da1ece85cf4c8429e39ef77f384ed43ae10.tar.bz2
gentoo-2-de887da1ece85cf4c8429e39ef77f384ed43ae10.zip
Fix compilation with gcc-4.4; bug #276742
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'dev-php5')
-rw-r--r--dev-php5/pecl-sca_sdo/ChangeLog8
-rw-r--r--dev-php5/pecl-sca_sdo/files/pecl-sca_sdo-1.2.4-gcc44.patch12
-rw-r--r--dev-php5/pecl-sca_sdo/pecl-sca_sdo-1.2.4.ebuild13
3 files changed, 28 insertions, 5 deletions
diff --git a/dev-php5/pecl-sca_sdo/ChangeLog b/dev-php5/pecl-sca_sdo/ChangeLog
index 3ae5365479ff..505b7ce16fdb 100644
--- a/dev-php5/pecl-sca_sdo/ChangeLog
+++ b/dev-php5/pecl-sca_sdo/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-php5/pecl-sca_sdo
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-sca_sdo/ChangeLog,v 1.5 2008/03/17 09:56:39 jokey Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-sca_sdo/ChangeLog,v 1.6 2009/07/25 22:15:29 halcy0n Exp $
+
+ 25 Jul 2009; Mark Loeser <halcy0n@gentoo.org> pecl-sca_sdo-1.2.4.ebuild,
+ +files/pecl-sca_sdo-1.2.4-gcc44.patch:
+ Fix compilation with gcc-4.4; bug #276742
*pecl-sca_sdo-1.2.4 (17 Mar 2008)
diff --git a/dev-php5/pecl-sca_sdo/files/pecl-sca_sdo-1.2.4-gcc44.patch b/dev-php5/pecl-sca_sdo/files/pecl-sca_sdo-1.2.4-gcc44.patch
new file mode 100644
index 000000000000..95fddb2f1434
--- /dev/null
+++ b/dev-php5/pecl-sca_sdo/files/pecl-sca_sdo-1.2.4-gcc44.patch
@@ -0,0 +1,12 @@
+diff -ur SCA_SDO-1.2.4-orig/commonj/sdo/SDODataConverter.cpp SCA_SDO-1.2.4/commonj/sdo/SDODataConverter.cpp
+--- SCA_SDO-1.2.4-orig/commonj/sdo/SDODataConverter.cpp 2009-07-25 18:09:10.000000000 -0400
++++ SCA_SDO-1.2.4/commonj/sdo/SDODataConverter.cpp 2009-07-25 18:09:42.000000000 -0400
+@@ -17,6 +17,7 @@
+
+ /* $Rev: 509991 $ $Date: 2009/07/25 22:15:28 $ */
+
++#include <cstdio>
+ #include <string.h>
+ #include "commonj/sdo/SDODataConverter.h"
+ #include "commonj/sdo/SDORuntimeException.h"
+
diff --git a/dev-php5/pecl-sca_sdo/pecl-sca_sdo-1.2.4.ebuild b/dev-php5/pecl-sca_sdo/pecl-sca_sdo-1.2.4.ebuild
index 011dc1e97c0c..23e5a57713c0 100644
--- a/dev-php5/pecl-sca_sdo/pecl-sca_sdo-1.2.4.ebuild
+++ b/dev-php5/pecl-sca_sdo/pecl-sca_sdo-1.2.4.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-sca_sdo/pecl-sca_sdo-1.2.4.ebuild,v 1.1 2008/03/17 09:56:39 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-sca_sdo/pecl-sca_sdo-1.2.4.ebuild,v 1.2 2009/07/25 22:15:29 halcy0n Exp $
PHP_EXT_NAME="sdo"
PHP_EXT_PECL_PKG="SCA_SDO"
PHP_EXT_INI="yes"
PHP_EXT_ZENDEXT="no"
-inherit php-ext-pecl-r1 depend.php
+inherit eutils php-ext-pecl-r1 depend.php
KEYWORDS="~amd64 ~x86"
@@ -25,6 +25,13 @@ pkg_setup() {
require_php_with_use json reflection soap spl xml
}
+src_unpack() {
+ php-ext-source-r1_src_unpack
+
+ cd "${S}"
+ epatch "${FILESDIR}"/${P}-gcc44.patch
+}
+
src_install() {
php-ext-pecl-r1_src_install