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)
- I haven't encountered any problem with libtool.
- There are no .orig files in the PHP source.
- The WANTLIB-main is already defined Makefile.inc

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>

Reply via email to