On 06/15/18 12:18, Stuart Henderson wrote:
> This makes the installed m4 file look like this
>
> dnl Find php-config script
> PHP_ARG_WITH(php-config,,
> -[ --with-php-config=PATH Path to php-config [php-config]], php-config, no)
> +[ --with-php-config=PATH Path to php-config [php-config]],
> php-config-{$PV}, no)
>
That's obviously a type-O. I use this to build weakref without adding
the --with-php-config, which isn't available for php-5.6, so I
overlooked the {$ vs ${ here for 5.6.
> This doesn't seem right to me, how is PV going to get passed in?
And I tested it in the wrong tree, where I missed a part. Full diff below.
>
> (It won't affect ports anyway as the php module already sets
> --with-php-config).
>
And with this patch those statements can be removed.
>
> On 2018/06/15 10:02, Martijn van Duren wrote:
>> ping
>>
>> On 06/05/18 12:00, Martijn van Duren wrote:
>>> After running phpize inside a pecl directory the configure script will
>>> ask where to find php-config. The following patch will add the required
>>> magic to make it find it itself.
>>>
>>> OK?
>>>
>>> martijn@
>>>
Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/lang/php/Makefile.inc,v
retrieving revision 1.118
diff -u -p -r1.118 Makefile.inc
--- Makefile.inc 15 Jun 2018 10:20:53 -0000 1.118
+++ Makefile.inc 17 Jun 2018 13:51:24 -0000
@@ -432,6 +432,7 @@ DESTDIRNAME= INSTALL_ROOT
pre-configure:
${SUBST_CMD} ${WRKSRC}/main/php_ini.c
+ ${SUBST_CMD} ${WRKSRC}/scripts/phpize.m4
@perl -pi -e "s,OPENBSD_PEAR_ROOT,'${CHROOT_DIR}/pear',g;" \
-e "s,OPENBSD_PREFIX,${TRUEPREFIX},;" \
${WRKSRC}/scripts/phpize.in \
Index: 5.6/Makefile
===================================================================
RCS file: /cvs/ports/lang/php/5.6/Makefile,v
retrieving revision 1.78
diff -u -p -r1.78 Makefile
--- 5.6/Makefile 15 Jun 2018 10:20:53 -0000 1.78
+++ 5.6/Makefile 17 Jun 2018 13:51:24 -0000
@@ -5,7 +5,7 @@ V= ${PV}.36
REVISION= 8
REVISION-apache= 9
REVISION-gd= 9
-REVISION-main= 10
+REVISION-main= 11
MASTER_SITES0= https://download.suhosin.org/
Index: 5.6/patches/patch-scripts_phpize_m4
===================================================================
RCS file: 5.6/patches/patch-scripts_phpize_m4
diff -N 5.6/patches/patch-scripts_phpize_m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 5.6/patches/patch-scripts_phpize_m4 17 Jun 2018 13:51:24 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- scripts/phpize.m4.orig Thu Jul 6 00:25:00 2017
++++ scripts/phpize.m4 Wed Oct 11 14:13:26 2017
+@@ -36,7 +36,7 @@ PHP_SHLIB_SUFFIX_NAMES
+
+ dnl Find php-config script
+ PHP_ARG_WITH(php-config,,
+-[ --with-php-config=PATH Path to php-config [php-config]], php-config, no)
++[ --with-php-config=PATH Path to php-config [php-config]],
php-config-${PV}, no)
+
+ dnl For BC
+ PHP_CONFIG=$PHP_PHP_CONFIG
Index: 7.0/Makefile
===================================================================
RCS file: /cvs/ports/lang/php/7.0/Makefile,v
retrieving revision 1.61
diff -u -p -r1.61 Makefile
--- 7.0/Makefile 15 Jun 2018 10:20:53 -0000 1.61
+++ 7.0/Makefile 17 Jun 2018 13:51:24 -0000
@@ -5,7 +5,7 @@ V= ${PV}.30
REVISION= 8
REVISION-apache= 9
REVISION-gd= 9
-REVISION-main= 10
+REVISION-main= 11
BUILD_DEPENDS+= devel/bison
Index: 7.0/patches/patch-scripts_phpize_m4
===================================================================
RCS file: 7.0/patches/patch-scripts_phpize_m4
diff -N 7.0/patches/patch-scripts_phpize_m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 7.0/patches/patch-scripts_phpize_m4 17 Jun 2018 13:51:24 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- scripts/phpize.m4.orig Tue Sep 26 10:55:54 2017
++++ scripts/phpize.m4 Wed Oct 11 09:23:37 2017
+@@ -36,7 +36,7 @@ PHP_SHLIB_SUFFIX_NAMES
+
+ dnl Find php-config script
+ PHP_ARG_WITH(php-config,,
+-[ --with-php-config=PATH Path to php-config [php-config]], php-config, no)
++[ --with-php-config=PATH Path to php-config [php-config]],
php-config-${PV}, no)
+
+ dnl For BC
+ PHP_CONFIG=$PHP_PHP_CONFIG
