[php-extras/epel7] - add workaround for https://bugzilla.redhat.com/1054659 - minimal load test for all extensions

[Remi Collet]

commit d49e2f1f377fd8f842b8cff21b9c0a3647581229
Author: Remi Collet <remi at fedoraproject.org>
Date:   Fri Jan 17 10:45:33 2014 +0100

    - add workaround for https://bugzilla.redhat.com/1054659
    - minimal load test for all extensions

 .gitignore         |    1 +
 php-extras.spec    |   15 ++++++++++++---
 php-firebird.patch |   34 ++++++++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4d49836..c7afc22 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
+clog
 /php-5.4.16.tar.bz2
diff --git a/php-extras.spec b/php-extras.spec
index 00c471c..75bc150 100644
--- a/php-extras.spec
+++ b/php-extras.spec
@@ -4,9 +4,7 @@
 %define def()	%%{!?_without_default:%%{!?_without_%1: %%global _with_%1 --with-%1}}
 
 %{expand:%def imap}
-%ifnarch ppc64
 %{expand:%def interbase}
-%endif
 %{expand:%def mcrypt}
 %{expand:%def mssql}
 %{expand:%def tidy}
@@ -22,9 +20,12 @@ Group:      Development/Languages
 License:    The PHP License
 URL:        http://www.php.net/
 Source0:    http://www.php.net/distributions/php-%{version}.tar.bz2
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+# Workarouond for https://bugzilla.redhat.com/1054659
+Patch0:     php-firebird.patch
 
 BuildRequires: php-devel >= 5.4
+BuildRequires: php-pdo
 
 
 %description
@@ -125,6 +126,8 @@ License.
 %prep
 %setup -q -n php-%{version}
 
+%patch0 -p1 -b .bug1054659
+
 # avoid tests which requires databases
 rm -rf ext/{mssql,pdo_dblib,interbase,pdo_firebird}/tests
 
@@ -150,10 +153,14 @@ done
 fail=0
 for mod in %{list}
 do
+    : Minimal load test for $mod extension
+    php -d extension=ext/$mod/modules/$mod.so -m | grep -i $mod
+
     [ -d ext/$mod/tests ] || continue
 
     pushd ext/$mod
 
+    : Upstream tests for $mod extension
     make test NO_INTERACTION=1 | tee rpmtests.log
     if grep -q "FAILED TEST" rpmtests.log
     then
@@ -209,6 +216,8 @@ rm -rf %{buildroot}
 %changelog
 * Thu Jan 16 2014 Remi Collet <rcollet at redhat.com> - 5.4.16-1
 - add interbase
+- add workaround for https://bugzilla.redhat.com/1054659
+- minimal load test for all extensions
 
 * Tue Jan 14 2014 Remi Collet <rcollet at redhat.com> - 5.4.16-0.1
 - add mcrypt
diff --git a/php-firebird.patch b/php-firebird.patch
new file mode 100644
index 0000000..fbe7ef5
--- /dev/null
+++ b/php-firebird.patch
@@ -0,0 +1,34 @@
+diff -up php-5.4.16/ext/interbase/config.m4.old php-5.4.16/ext/interbase/config.m4
+--- php-5.4.16/ext/interbase/config.m4.old	2014-01-17 10:27:35.769189459 +0100
++++ php-5.4.16/ext/interbase/config.m4	2014-01-17 10:27:44.729127468 +0100
+@@ -35,10 +35,11 @@ if test "$PHP_INTERBASE" != "no"; then
+       -L$IBASE_LIBDIR
+     ])
+   ], [
+-    -L$IBASE_LIBDIR
++    -L$IBASE_LIBDIR -lstdc++
+   ])
+   
+   PHP_ADD_LIBRARY_WITH_PATH($IBASE_LIBNAME, $IBASE_LIBDIR, INTERBASE_SHARED_LIBADD)
++  PHP_ADD_LIBRARY_WITH_PATH(stdc++, $IBASE_LIBDIR, INTERBASE_SHARED_LIBADD)
+   PHP_ADD_INCLUDE($IBASE_INCDIR)
+   AC_DEFINE(HAVE_IBASE,1,[ ])
+   PHP_NEW_EXTENSION(interbase, interbase.c ibase_query.c ibase_service.c ibase_events.c ibase_blobs.c, $ext_shared)
+diff -up php-5.4.16/ext/pdo_firebird/config.m4.old php-5.4.16/ext/pdo_firebird/config.m4
+--- php-5.4.16/ext/pdo_firebird/config.m4.old	2014-01-17 10:28:04.912990400 +0100
++++ php-5.4.16/ext/pdo_firebird/config.m4	2014-01-17 10:28:09.928970914 +0100
+@@ -42,12 +42,13 @@ if test "$PHP_PDO_FIREBIRD" != "no"; the
+       $FIREBIRD_LIBDIR_FLAG
+     ])
+   ], [
+-    $FIREBIRD_LIBDIR_FLAG
++    $FIREBIRD_LIBDIR_FLAG -lstdc++
+   ])
+  
+   PHP_CHECK_PDO_INCLUDES
+ 
+   PHP_ADD_LIBRARY_WITH_PATH($FIREBIRD_LIBNAME, $FIREBIRD_LIBDIR, PDO_FIREBIRD_SHARED_LIBADD)
++  PHP_ADD_LIBRARY_WITH_PATH(stdc++, $FIREBIRD_LIBDIR, PDO_FIREBIRD_SHARED_LIBADD)
+   PHP_ADD_INCLUDE($FIREBIRD_INCDIR)
+   AC_DEFINE(HAVE_PDO_FIREBIRD,1,[ ])
+   PHP_NEW_EXTENSION(pdo_firebird, pdo_firebird.c firebird_driver.c firebird_statement.c, $ext_shared,,-I$pdo_cv_inc_path)