On Mon, Apr 21, 2014 at 11:27:44AM +0100, Edd Barrett wrote:
> I'll prep a new diff enabling readline on only 5.4/5.5.
New diff below.
I ran the test suite for both 5.4 and 5.5 before and after enabling readline
to check I didn't break anything. Oddly enough, there is one new failing
test: on 5.4 ext/ftp/tests/bug37799.phpt. By repeatedly running the test,
it became clear that this is a non-deterministically failing test, so meh.
NOTE: the intl multi packages have extra 'm' in WANTLIB (even before my
changes). Not sure if that is intentional, but can fix in a separate diff.
OK?
Index: 5.4/Makefile
===================================================================
RCS file: /home/edd/cvsync/cvs/ports/lang/php/5.4/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- 5.4/Makefile 6 Apr 2014 12:52:25 -0000 1.22
+++ 5.4/Makefile 21 Apr 2014 21:28:54 -0000
@@ -9,11 +9,18 @@ USE_LIBTOOL= No
PV= 5.4
V= ${PV}.27
+REVISION-main = 0
+REVISION-fpm = 0
+REVISION-fastcgi = 0
+
INI_TEMPLATES= development production
CONFIGURE_ARGS+= --enable-mysqlnd
-WANTLIB-main+= stdc++
+# Readline support is broken in PHP 5.3, hence this is not in Makefile.inc
+CONFIGURE_ARGS += --with-readline
+
+WANTLIB-main+= stdc++ ncurses readline
# fpm
PKGNAME-fpm?= php-fpm-${V}
Index: 5.5/Makefile
===================================================================
RCS file: /home/edd/cvsync/cvs/ports/lang/php/5.5/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- 5.5/Makefile 6 Apr 2014 12:53:41 -0000 1.13
+++ 5.5/Makefile 21 Apr 2014 21:29:02 -0000
@@ -8,12 +8,18 @@ USE_LIBTOOL= No
PV= 5.5
V= ${PV}.11
+REVISION-main = 0
+REVISION-fpm = 0
+REVISION-fastcgi = 0
INI_TEMPLATES= development production
CONFIGURE_ARGS+= --enable-mysqlnd
-WANTLIB-main+= stdc++
+# Readline support is broken in PHP 5.3, hence this is not in Makefile.inc
+CONFIGURE_ARGS += --with-readline
+
+WANTLIB-main+= stdc++ ncurses readline
# fpm
PKGNAME-fpm?= php-fpm-${V}
--
Best Regards
Edd Barrett
http://www.theunixzoo.co.uk
