On 11/16/17 21:58, Stuart Henderson wrote:
> On 2017/11/16 20:30, Martijn van Duren wrote:
>> Hello ports@,
>>
>> Here's the next diff. Cleaning up some of the redundant build
>> environment setup:
>> - PHP (include 7.0 and 7.1) build find with base yacc.
>> (at least for the 100+ times I've done so far)
>
> Any failure from this is not going to be intermittent, if there's a problem
> it's either going to be a buggy parser, or an outright failure.
I haven't actively run the 7.0 branch in quite a while, but doing
active coding in 7.1 with base yacc works for me for about half a year
now.
So there's no 100% guarantee that it's safe, but I feel confident about
it.
>
> Does anyone remember why it's using bison rather than yacc?
>
> I don't oppose this, but I'd like to know it's safe.
>
According to cvs blame it was added by robert@ in r1.8 of the file.
No indication in the commit message about why it was added.
I don't see any OK on the commit, so I don't know if anyone else knows
why it's there.
>
>> - I haven't encountered any problem with libtool.
>
> Does anyone remember what the options referred to in the comment are?
>
> Same as above: I don't oppose this, but I'd like to know it's safe.
>
Added by robert@ in r1.67 as part of the reintroduction of suhosin.
Also no indication why it was added nor an OK, same as above.
>
>> - There are no .orig files in the PHP source.
>
> Not at present, but there have been at various times. I would be
> inclined to keep that as it doesn't hurt in the normal case, and makes
> updating a lot less annoying if they return.
>
That wouldn't be a show stopper for me personally, but I'll leave it in.
>
>> - The WANTLIB-main is already defined Makefile.inc
>
> OK for that.
Committed.
I'll move on to the next patch, but I'd still like to know if the LIBTOOL
and YACC stuff can be removed, so it can possibly be committed later.
>
> REVISION bump not needed for this particular WANTLIB-main change
> (order shuffling and removing dupes doesn't require a bump), but
> the libtool and yacc changes (if safe) should have a bump as they
> potentially could affect package contents.
>
>
>> I haven't touched php.port.mk and pecl/pecl.port.mk because
>> there's still to many dragons lurking there.
>>
>> OK?
>>
>> martijn@
>>
>> Index: Makefile.inc
>> ===================================================================
>> RCS file: /cvs/ports/lang/php/Makefile.inc,v
>> retrieving revision 1.99
>> diff -u -p -u -r1.99 Makefile.inc
>> --- Makefile.inc 16 Nov 2017 18:37:01 -0000 1.99
>> +++ Makefile.inc 16 Nov 2017 19:24:25 -0000
>> @@ -43,17 +43,13 @@ MODULES_DIR= ${LOCALBASE}/${MODULES_SUB
>>
>> INI_TEMPLATES?= development production
>>
>> -# XXX use the bundled libtool because it needs some specific options we
>> -# don't have.
>> -USE_LIBTOOL?= No
>> -
>> -PATCHORIG= .orig.port
>> CONFIGURE_STYLE= autoconf
>> AUTOCONF_VERSION?= 2.69
>> CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include
>> -pthread" \
>> LDFLAGS="-L${LOCALBASE}/lib -pthread" \
>> EXTENSION_DIR=${MODULES_DIR} \
>> COMPILER_LIBCXX="${LIBCXX}" \
>> + YACC=/usr/bin/yacc \
>> lt_cv_path_SED=/usr/bin/sed
>> # configure detects us as having decimal fp support but it's not built in
>> # in libgcc. https://bugs.php.net/bug.php?id=68114
>> Index: 5.6/Makefile
>> ===================================================================
>> RCS file: /cvs/ports/lang/php/5.6/Makefile,v
>> retrieving revision 1.54
>> diff -u -p -u -r1.54 Makefile
>> --- 5.6/Makefile 16 Nov 2017 18:37:01 -0000 1.54
>> +++ 5.6/Makefile 16 Nov 2017 19:24:25 -0000
>> @@ -8,8 +8,6 @@ REVISION= 0
>>
>> MASTER_SITES0= https://download.suhosin.org/
>>
>> -WANTLIB-main+= ${COMPILER_LIBCXX} ncurses readline
>> -
>> FLAVORS= no_suhosin
>> FLAVOR?=
>>
>> Index: 7.0/Makefile
>> ===================================================================
>> RCS file: /cvs/ports/lang/php/7.0/Makefile,v
>> retrieving revision 1.37
>> diff -u -p -u -r1.37 Makefile
>> --- 7.0/Makefile 16 Nov 2017 18:37:01 -0000 1.37
>> +++ 7.0/Makefile 16 Nov 2017 19:24:25 -0000
>> @@ -6,11 +6,6 @@ PV= 7.0
>> V= ${PV}.23
>> REVISION= 0
>>
>> -WANTLIB-main+= ${COMPILER_LIBCXX} ncurses readline
>> -
>> -BUILD_DEPENDS+= devel/bison
>> -
>> -CONFIGURE_ENV+= YACC="${LOCALBASE}/bin/bison -y"
>> CONFIGURE_ARGS+= --with-pcre-jit=no
>>
>> .include <bsd.port.mk>
>>
