Merge remote-tracking branch 'origin/master'

phpmyadmin · Feb 26, 2015 · cc130c1 · cc130c1
2 parents 0797e0c + 0449e52
commit cc130c1
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/test/install-runkit b/test/install-runkit
@@ -2,12 +2,15 @@
 
 set -e
 
+git clone --depth=1 git://github.com/zenovich/runkit.git
+
+pushd runkit
+
 if [ $TRAVIS_PHP_VERSION = "5.6" ] ; then
-    git clone --depth=1 git://github.com/adrianguenter/runkit.git
-else
-    git clone --depth=1 git://github.com/zenovich/runkit.git
+    wget https://github.com/zenovich/runkit/pull/73.diff
+    patch -p1 < 73.diff
 fi
-pushd runkit
+
 phpize
 ./configure
 make