From 6547f1f2442f1f0da4b9869b5e951b6726a4ea9f Mon Sep 17 00:00:00 2001 From: Luca Longinotti Date: Sun, 18 Dec 2005 21:26:23 +0000 Subject: Fix Gentoo bug #115921. Package-Manager: portage-2.0.53 --- dev-php5/pecl-pdo-mysql/ChangeLog | 6 +++++- dev-php5/pecl-pdo-mysql/Manifest | 5 +++-- dev-php5/pecl-pdo-mysql/files/config-sed.patch | 12 ++++++++++++ dev-php5/pecl-pdo-mysql/pecl-pdo-mysql-1.0.1.ebuild | 11 ++++++++++- 4 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 dev-php5/pecl-pdo-mysql/files/config-sed.patch (limited to 'dev-php5') diff --git a/dev-php5/pecl-pdo-mysql/ChangeLog b/dev-php5/pecl-pdo-mysql/ChangeLog index 62e621ac3c87..2e790049aecc 100644 --- a/dev-php5/pecl-pdo-mysql/ChangeLog +++ b/dev-php5/pecl-pdo-mysql/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-php5/pecl-pdo-mysql # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-mysql/ChangeLog,v 1.6 2005/12/18 01:41:44 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-mysql/ChangeLog,v 1.7 2005/12/18 21:26:23 chtekk Exp $ + + 18 Dec 2005; Luca Longinotti +files/config-sed.patch, + pecl-pdo-mysql-1.0.1.ebuild: + Fix Gentoo bug #115921. *pecl-pdo-mysql-1.0.1 (18 Dec 2005) diff --git a/dev-php5/pecl-pdo-mysql/Manifest b/dev-php5/pecl-pdo-mysql/Manifest index b7254c2dfffb..f13f143b1272 100644 --- a/dev-php5/pecl-pdo-mysql/Manifest +++ b/dev-php5/pecl-pdo-mysql/Manifest @@ -1,4 +1,5 @@ -MD5 96db9e385cd6bf878d06058e92b6f53b ChangeLog 977 +MD5 075cf284fe96e4a23a9278d6ada1bec0 ChangeLog 1111 +MD5 3056c682a94fb76a1c8adeb30bf69c6b files/config-sed.patch 490 MD5 4ee92172ccf8ef55a8ec4ab538ddcaa0 files/digest-pecl-pdo-mysql-1.0.1 63 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157 -MD5 8905192eeda58a96ae92f57aeaf0c8b5 pecl-pdo-mysql-1.0.1.ebuild 1078 +MD5 cd11839e9e93e19b999b833598f0844e pecl-pdo-mysql-1.0.1.ebuild 1187 diff --git a/dev-php5/pecl-pdo-mysql/files/config-sed.patch b/dev-php5/pecl-pdo-mysql/files/config-sed.patch new file mode 100644 index 000000000000..2fdb7f731864 --- /dev/null +++ b/dev-php5/pecl-pdo-mysql/files/config-sed.patch @@ -0,0 +1,12 @@ +--- config.m4 2005-12-18 22:18:10.000000000 +0100 ++++ config.m4 2005-12-18 22:18:52.000000000 +0100 +@@ -50,6 +50,9 @@ + + if test -n "$PDO_MYSQL_CONFIG" && test -x "$PDO_MYSQL_CONFIG" ; then + AC_MSG_RESULT($PDO_MYSQL_CONFIG) ++ if test "x$SED" = "x"; then ++ AC_PATH_PROG(SED, sed) ++ fi + PDO_MYSQL_INCLUDE=`$PDO_MYSQL_CONFIG --cflags | $SED -e "s/'//g"` + PDO_MYSQL_LIBS=`$PDO_MYSQL_CONFIG --libs | $SED -e "s/'//g"` + PDO_MYSQL_SOCKET=`$PDO_MYSQL_CONFIG --socket` diff --git a/dev-php5/pecl-pdo-mysql/pecl-pdo-mysql-1.0.1.ebuild b/dev-php5/pecl-pdo-mysql/pecl-pdo-mysql-1.0.1.ebuild index e9febe16514c..22c246349c1d 100644 --- a/dev-php5/pecl-pdo-mysql/pecl-pdo-mysql-1.0.1.ebuild +++ b/dev-php5/pecl-pdo-mysql/pecl-pdo-mysql-1.0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-mysql/pecl-pdo-mysql-1.0.1.ebuild,v 1.1 2005/12/18 01:41:44 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-mysql/pecl-pdo-mysql-1.0.1.ebuild,v 1.2 2005/12/18 21:26:23 chtekk Exp $ PHP_EXT_NAME="pdo_mysql" PHP_EXT_PECL_PKG="PDO_MYSQL" @@ -35,6 +35,15 @@ pkg_setup() { fi } +src_unpack() { + unpack ${A} + + cd "${S}" + + # Fix Gentoo bug #115921 + epatch "${FILESDIR}/config-sed.patch" +} + src_compile() { has_php my_conf="--with-pdo-mysql=/usr" -- cgit v1.2.3-65-gdbad