- Replace USE_AUTOTOOLS with USES=autoreconf:build and run an upstream

script in pre-configure to regenerate configure scripts.  Because this
  regenerates php_config.h.in, merge a patch for that file into the patch
  for configure.in.
- Remove redundant --localstatedir=/var (added by bsd.port.mk).
This commit is contained in:
Tijl Coosemans 2018-01-12 12:57:18 +00:00
parent f262887ab1
commit 8c60cffc90
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=458821
12 changed files with 70 additions and 119 deletions

View file

@ -17,12 +17,10 @@ USES+= tar:xz cpe
CPE_PRODUCT= php CPE_PRODUCT= php
NO_OPTIONS_SORT=yes NO_OPTIONS_SORT=yes
.if !defined(PKGNAMESUFFIX) .if !defined(PKGNAMESUFFIX)
USE_AUTOTOOLS= autoconf
LIB_DEPENDS= libpcre.so:devel/pcre LIB_DEPENDS= libpcre.so:devel/pcre
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-layout=GNU \ CONFIGURE_ARGS+=--with-layout=GNU \
--localstatedir=/var \
--with-config-file-scan-dir=${PREFIX}/etc/php \ --with-config-file-scan-dir=${PREFIX}/etc/php \
--disable-all \ --disable-all \
--enable-libxml \ --enable-libxml \
@ -31,7 +29,7 @@ CONFIGURE_ARGS+=--with-layout=GNU \
--with-pcre-regex=${LOCALBASE} \ --with-pcre-regex=${LOCALBASE} \
--with-zlib-dir=/usr \ --with-zlib-dir=/usr \
--program-prefix="" --program-prefix=""
USES+= autoreconf:build
USE_GNOME= libxml2 USE_GNOME= libxml2
OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 MAILHEAD LINKTHR ZTS OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 MAILHEAD LINKTHR ZTS
@ -171,12 +169,8 @@ post-patch:
${WRKSRC}/sapi/fpm/php-fpm.conf.in ${WRKSRC}/sapi/fpm/php-fpm.conf.in
.endif .endif
# Work around issues with newer (>=2.64) autoconf
pre-configure: pre-configure:
@${REINPLACE_CMD} -E 's:^((m4_)?divert)[(]([0-9]*)[)]:\1(600\3):' \ @(cd ${WRKSRC} && ${SETENV} MAKE=${MAKE_CMD} ./buildconf --force)
${WRKSRC}/configure.in `${FIND} ${WRKSRC} -name '*.m4'`
@${RM} ${WRKSRC}/configure
@${CAT} ${WRKSRC}/acinclude.m4 ${WRKSRC}/build/libtool.m4 > ${WRKSRC}/aclocal.m4
.if !defined(PKGNAMEPREFIX) .if !defined(PKGNAMEPREFIX)
post-build: post-build:

View file

@ -1,6 +1,14 @@
--- configure.in.orig 2014-04-01 12:32:03.000000000 +0000 --- configure.in.orig 2017-10-25 01:48:22 UTC
+++ configure.in 2014-04-09 07:56:27.824397653 +0000 +++ configure.in
@@ -370,7 +370,6 @@ @@ -115,6 +115,7 @@ int zend_sprintf(char *buffer, const char *format, ...
#endif
#undef PTHREADS
+#include <ext/php_config.h>
])
PHP_MAJOR_VERSION=5
@@ -370,7 +371,6 @@ sinclude(TSRM/tsrm.m4)
dnl . dnl .
dnl ------------------------------------------------------------------------- dnl -------------------------------------------------------------------------
@ -8,7 +16,7 @@
PHP_HELP_SEPARATOR([SAPI modules:]) PHP_HELP_SEPARATOR([SAPI modules:])
PHP_SHLIB_SUFFIX_NAMES PHP_SHLIB_SUFFIX_NAMES
PHP_BUILD_PROGRAM PHP_BUILD_PROGRAM
@@ -401,15 +400,9 @@ @@ -401,15 +401,9 @@ else
AC_MSG_RESULT([none]) AC_MSG_RESULT([none])
fi fi
@ -24,7 +32,7 @@
fi fi
dnl Starting system checks. dnl Starting system checks.
@@ -688,7 +681,7 @@ @@ -691,7 +685,7 @@ nanosleep \
) )
dnl Some systems (like OpenSolaris) do not have nanosleep in libc dnl Some systems (like OpenSolaris) do not have nanosleep in libc
@ -33,7 +41,7 @@
dnl Check for getaddrinfo, should be a better way, but... dnl Check for getaddrinfo, should be a better way, but...
dnl Also check for working getaddrinfo dnl Also check for working getaddrinfo
@@ -1225,7 +1218,7 @@ @@ -1242,7 +1236,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfdir`
EXPANDED_DATADIR=$datadir EXPANDED_DATADIR=$datadir
EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"` EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"`
EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"` EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"`
@ -42,12 +50,12 @@
exec_prefix=$old_exec_prefix exec_prefix=$old_exec_prefix
libdir=$old_libdir libdir=$old_libdir
@@ -1435,7 +1428,7 @@ @@ -1452,7 +1446,7 @@ PHP_SUBST(all_targets)
PHP_SUBST(install_targets) PHP_SUBST(install_targets)
PHP_SUBST(install_binary_targets) PHP_SUBST(install_binary_targets)
-PHP_INSTALL_HEADERS([Zend/ TSRM/ include/ main/ main/streams/]) -PHP_INSTALL_HEADERS([Zend/ TSRM/ include/ main/ main/streams/])
+PHP_INSTALL_HEADERS([Zend/ TSRM/ main/ main/streams/]) +PHP_INSTALL_HEADERS([Zend/ TSRM/ main/ main/streams/])
PHP_ADD_SOURCES(TSRM, TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.c) PHP_ADD_SOURCES(TSRM, TSRM.c tsrm_strtok_r.c)

View file

@ -1,12 +0,0 @@
--- main/php_config.h.in.orig 2013-12-10 23:50:50.000000000 +0000
+++ main/php_config.h.in 2013-12-13 21:50:25.396258363 +0000
@@ -2342,6 +2342,9 @@
/* Define if processor uses big-endian word */
#undef WORDS_BIGENDIAN
+/* Include external shared modules configurations */
+#include "ext/php_config.h"
+
/* Whether sprintf is broken */
#undef ZEND_BROKEN_SPRINTF

View file

@ -17,15 +17,10 @@ USES+= tar:xz cpe
CPE_PRODUCT= php CPE_PRODUCT= php
NO_OPTIONS_SORT=yes NO_OPTIONS_SORT=yes
.if !defined(PKGNAMESUFFIX) .if !defined(PKGNAMESUFFIX)
USE_AUTOTOOLS= autoconf
#NOTE: libtools ends with Version mismatch error
#USES+= autoreconf gmake
#GNU_CONFIGURE= yes
LIB_DEPENDS= libpcre.so:devel/pcre LIB_DEPENDS= libpcre.so:devel/pcre
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-layout=GNU \ CONFIGURE_ARGS+=--with-layout=GNU \
--localstatedir=/var \
--with-config-file-scan-dir=${PREFIX}/etc/php \ --with-config-file-scan-dir=${PREFIX}/etc/php \
--disable-all \ --disable-all \
--enable-libxml \ --enable-libxml \
@ -33,7 +28,7 @@ CONFIGURE_ARGS+=--with-layout=GNU \
--with-libxml-dir=${LOCALBASE} \ --with-libxml-dir=${LOCALBASE} \
--with-pcre-regex=${LOCALBASE} \ --with-pcre-regex=${LOCALBASE} \
--program-prefix="" --program-prefix=""
USES+= autoreconf:build
USE_GNOME= libxml2 USE_GNOME= libxml2
OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 MAILHEAD LINKTHR ZTS OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 MAILHEAD LINKTHR ZTS
@ -159,12 +154,8 @@ post-patch:
${WRKSRC}/sapi/fpm/php-fpm.conf.in ${WRKSRC}/sapi/fpm/php-fpm.conf.in
.endif .endif
# Work around issues with newer (>=2.64) autoconf
pre-configure: pre-configure:
@${REINPLACE_CMD} -E 's:^((m4_)?divert)[(]([0-9]*)[)]:\1(600\3):' \ @(cd ${WRKSRC} && ${SETENV} MAKE=${MAKE_CMD} ./buildconf --force)
${WRKSRC}/configure.in `${FIND} ${WRKSRC} -name '*.m4'`
@${RM} ${WRKSRC}/configure
@${CAT} ${WRKSRC}/acinclude.m4 ${WRKSRC}/build/libtool.m4 > ${WRKSRC}/aclocal.m4
.if !defined(PKGNAMEPREFIX) .if !defined(PKGNAMEPREFIX)
post-build: post-build:

View file

@ -1,6 +1,14 @@
--- configure.in.orig 2016-07-20 13:11:23 UTC --- configure.in.orig 2018-01-02 08:50:07 UTC
+++ configure.in +++ configure.in
@@ -370,7 +370,6 @@ sinclude(TSRM/tsrm.m4) @@ -115,6 +115,7 @@ int zend_sprintf(char *buffer, const char *format, ...
#endif
#undef PTHREADS
+#include <ext/php_config.h>
])
PHP_MAJOR_VERSION=7
@@ -370,7 +371,6 @@ sinclude(TSRM/tsrm.m4)
dnl . dnl .
dnl ------------------------------------------------------------------------- dnl -------------------------------------------------------------------------
@ -8,7 +16,7 @@
PHP_HELP_SEPARATOR([SAPI modules:]) PHP_HELP_SEPARATOR([SAPI modules:])
PHP_SHLIB_SUFFIX_NAMES PHP_SHLIB_SUFFIX_NAMES
PHP_BUILD_PROGRAM PHP_BUILD_PROGRAM
@@ -401,15 +400,9 @@ else @@ -401,15 +401,9 @@ else
AC_MSG_RESULT([none]) AC_MSG_RESULT([none])
fi fi
@ -24,7 +32,7 @@
fi fi
dnl Starting system checks. dnl Starting system checks.
@@ -700,7 +693,7 @@ nanosleep \ @@ -701,7 +695,7 @@ nanosleep \
) )
dnl Some systems (like OpenSolaris) do not have nanosleep in libc dnl Some systems (like OpenSolaris) do not have nanosleep in libc
@ -33,7 +41,7 @@
dnl Check for getaddrinfo, should be a better way, but... dnl Check for getaddrinfo, should be a better way, but...
dnl Also check for working getaddrinfo dnl Also check for working getaddrinfo
@@ -1251,7 +1244,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfd @@ -1252,7 +1246,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfdir`
EXPANDED_DATADIR=$datadir EXPANDED_DATADIR=$datadir
EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"` EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"`
EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"` EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"`
@ -42,7 +50,7 @@
exec_prefix=$old_exec_prefix exec_prefix=$old_exec_prefix
libdir=$old_libdir libdir=$old_libdir
@@ -1460,7 +1453,7 @@ PHP_SUBST(all_targets) @@ -1461,7 +1455,7 @@ PHP_SUBST(all_targets)
PHP_SUBST(install_targets) PHP_SUBST(install_targets)
PHP_SUBST(install_binary_targets) PHP_SUBST(install_binary_targets)

View file

@ -1,12 +0,0 @@
--- main/php_config.h.in.orig 2016-07-20 13:12:32 UTC
+++ main/php_config.h.in
@@ -2426,6 +2426,9 @@
/* Define if processor uses big-endian word */
#undef WORDS_BIGENDIAN
+/* Include external shared modules configurations */
+#include "ext/php_config.h"
+
/* Whether sprintf is broken */
#undef ZEND_BROKEN_SPRINTF

View file

@ -18,15 +18,10 @@ CPE_PRODUCT= php
NO_OPTIONS_SORT=yes NO_OPTIONS_SORT=yes
.if !defined(PKGNAMESUFFIX) .if !defined(PKGNAMESUFFIX)
USE_AUTOTOOLS= autoconf
#NOTE: libtools ends with Version mismatch error
#USES+= autoreconf gmake
#GNU_CONFIGURE= yes
LIB_DEPENDS= libpcre.so:devel/pcre LIB_DEPENDS= libpcre.so:devel/pcre
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-layout=GNU \ CONFIGURE_ARGS+=--with-layout=GNU \
--localstatedir=/var \
--with-config-file-scan-dir=${PREFIX}/etc/php \ --with-config-file-scan-dir=${PREFIX}/etc/php \
--disable-all \ --disable-all \
--enable-libxml \ --enable-libxml \
@ -34,7 +29,7 @@ CONFIGURE_ARGS+=--with-layout=GNU \
--with-libxml-dir=${LOCALBASE} \ --with-libxml-dir=${LOCALBASE} \
--with-pcre-regex=${LOCALBASE} \ --with-pcre-regex=${LOCALBASE} \
--program-prefix="" --program-prefix=""
USES+= autoreconf:build
USE_GNOME= libxml2 USE_GNOME= libxml2
OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 MAILHEAD LINKTHR ZTS OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 MAILHEAD LINKTHR ZTS
@ -161,12 +156,8 @@ post-patch:
${WRKSRC}/sapi/fpm/php-fpm.conf.in ${WRKSRC}/sapi/fpm/php-fpm.conf.in
.endif .endif
# Work around issues with newer (>=2.64) autoconf
pre-configure: pre-configure:
@${REINPLACE_CMD} -E 's:^((m4_)?divert)[(]([0-9]*)[)]:\1(600\3):' \ @(cd ${WRKSRC} && ${SETENV} MAKE=${MAKE_CMD} ./buildconf --force)
${WRKSRC}/configure.in `${FIND} ${WRKSRC} -name '*.m4'`
@${RM} ${WRKSRC}/configure
@${CAT} ${WRKSRC}/acinclude.m4 ${WRKSRC}/build/libtool.m4 > ${WRKSRC}/aclocal.m4
.if !defined(PKGNAMEPREFIX) .if !defined(PKGNAMEPREFIX)
post-build: post-build:

View file

@ -1,6 +1,14 @@
--- configure.in.orig 2016-07-20 13:11:23 UTC --- configure.in.orig 2018-01-03 02:32:22 UTC
+++ configure.in +++ configure.in
@@ -370,7 +370,6 @@ sinclude(TSRM/tsrm.m4) @@ -115,6 +115,7 @@ int zend_sprintf(char *buffer, const char *format, ...
#endif
#undef PTHREADS
+#include <ext/php_config.h>
])
PHP_MAJOR_VERSION=7
@@ -370,7 +371,6 @@ sinclude(TSRM/tsrm.m4)
dnl . dnl .
dnl ------------------------------------------------------------------------- dnl -------------------------------------------------------------------------
@ -8,7 +16,7 @@
PHP_HELP_SEPARATOR([SAPI modules:]) PHP_HELP_SEPARATOR([SAPI modules:])
PHP_SHLIB_SUFFIX_NAMES PHP_SHLIB_SUFFIX_NAMES
PHP_BUILD_PROGRAM PHP_BUILD_PROGRAM
@@ -401,15 +400,9 @@ else @@ -401,15 +401,9 @@ else
AC_MSG_RESULT([none]) AC_MSG_RESULT([none])
fi fi
@ -24,7 +32,7 @@
fi fi
dnl Starting system checks. dnl Starting system checks.
@@ -700,7 +693,7 @@ nanosleep \ @@ -701,7 +695,7 @@ nanosleep \
) )
dnl Some systems (like OpenSolaris) do not have nanosleep in libc dnl Some systems (like OpenSolaris) do not have nanosleep in libc
@ -33,7 +41,7 @@
dnl Check for getaddrinfo, should be a better way, but... dnl Check for getaddrinfo, should be a better way, but...
dnl Also check for working getaddrinfo dnl Also check for working getaddrinfo
@@ -1251,7 +1244,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfd @@ -1252,7 +1246,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfdir`
EXPANDED_DATADIR=$datadir EXPANDED_DATADIR=$datadir
EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"` EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"`
EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"` EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"`
@ -42,7 +50,7 @@
exec_prefix=$old_exec_prefix exec_prefix=$old_exec_prefix
libdir=$old_libdir libdir=$old_libdir
@@ -1460,7 +1453,7 @@ PHP_SUBST(all_targets) @@ -1461,7 +1455,7 @@ PHP_SUBST(all_targets)
PHP_SUBST(install_targets) PHP_SUBST(install_targets)
PHP_SUBST(install_binary_targets) PHP_SUBST(install_binary_targets)

View file

@ -1,12 +0,0 @@
--- main/php_config.h.in.orig 2016-07-20 13:12:32 UTC
+++ main/php_config.h.in
@@ -2426,6 +2426,9 @@
/* Define if processor uses big-endian word */
#undef WORDS_BIGENDIAN
+/* Include external shared modules configurations */
+#include "ext/php_config.h"
+
/* Whether sprintf is broken */
#undef ZEND_BROKEN_SPRINTF

View file

@ -17,16 +17,11 @@ CPE_PRODUCT= php
NO_OPTIONS_SORT=yes NO_OPTIONS_SORT=yes
.if !defined(PKGNAMESUFFIX) .if !defined(PKGNAMESUFFIX)
USE_AUTOTOOLS= autoconf
#NOTE: libtools ends with Version mismatch error
#USES+= autoreconf gmake
#GNU_CONFIGURE= yes
LIB_DEPENDS= libpcre.so:devel/pcre \ LIB_DEPENDS= libpcre.so:devel/pcre \
libargon2.so:security/libargon2 libargon2.so:security/libargon2
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-layout=GNU \ CONFIGURE_ARGS+=--with-layout=GNU \
--localstatedir=/var \
--with-config-file-scan-dir=${PREFIX}/etc/php \ --with-config-file-scan-dir=${PREFIX}/etc/php \
--disable-all \ --disable-all \
--enable-libxml \ --enable-libxml \
@ -35,7 +30,7 @@ CONFIGURE_ARGS+=--with-layout=GNU \
--with-pcre-regex=${LOCALBASE} \ --with-pcre-regex=${LOCALBASE} \
--with-password-argon2=${LOCALBASE} \ --with-password-argon2=${LOCALBASE} \
--program-prefix="" --program-prefix=""
USES+= autoreconf:build
USE_GNOME= libxml2 USE_GNOME= libxml2
OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 LINKTHR ZTS OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 LINKTHR ZTS
@ -154,12 +149,8 @@ post-patch:
${WRKSRC}/sapi/fpm/php-fpm.conf.in ${WRKSRC}/sapi/fpm/php-fpm.conf.in
.endif .endif
# Work around issues with newer (>=2.64) autoconf
pre-configure: pre-configure:
@${REINPLACE_CMD} -E 's:^((m4_)?divert)[(]([0-9]*)[)]:\1(600\3):' \ @(cd ${WRKSRC} && ${SETENV} MAKE=${MAKE_CMD} ./buildconf --force)
${WRKSRC}/configure.ac `${FIND} ${WRKSRC} -name '*.m4'`
@${RM} ${WRKSRC}/configure
@${CAT} ${WRKSRC}/acinclude.m4 ${WRKSRC}/build/libtool.m4 > ${WRKSRC}/aclocal.m4
.if !defined(PKGNAMEPREFIX) .if !defined(PKGNAMEPREFIX)
post-build: post-build:

View file

@ -1,6 +1,14 @@
--- configure.ac.orig 2016-07-20 13:11:23 UTC --- configure.ac.orig 2018-01-02 22:35:55 UTC
+++ configure.ac +++ configure.ac
@@ -370,7 +370,6 @@ sinclude(TSRM/tsrm.m4) @@ -102,6 +102,7 @@ int zend_sprintf(char *buffer, const char *format, ...
#undef PTHREADS
+#include <ext/php_config.h>
#endif /* PHP_CONFIG_H */
])
@@ -339,7 +340,6 @@ sinclude(TSRM/tsrm.m4)
dnl . dnl .
dnl ------------------------------------------------------------------------- dnl -------------------------------------------------------------------------
@ -8,7 +16,7 @@
PHP_HELP_SEPARATOR([SAPI modules:]) PHP_HELP_SEPARATOR([SAPI modules:])
PHP_SHLIB_SUFFIX_NAMES PHP_SHLIB_SUFFIX_NAMES
PHP_BUILD_PROGRAM PHP_BUILD_PROGRAM
@@ -401,15 +400,9 @@ else @@ -370,15 +370,9 @@ else
AC_MSG_RESULT([none]) AC_MSG_RESULT([none])
fi fi
@ -24,7 +32,7 @@
fi fi
dnl Starting system checks. dnl Starting system checks.
@@ -700,7 +693,7 @@ nanosleep \ @@ -682,7 +676,7 @@ nanosleep \
) )
dnl Some systems (like OpenSolaris) do not have nanosleep in libc dnl Some systems (like OpenSolaris) do not have nanosleep in libc
@ -33,7 +41,7 @@
dnl Check for getaddrinfo, should be a better way, but... dnl Check for getaddrinfo, should be a better way, but...
dnl Also check for working getaddrinfo dnl Also check for working getaddrinfo
@@ -1251,7 +1244,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfd @@ -1235,7 +1229,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfdir`
EXPANDED_DATADIR=$datadir EXPANDED_DATADIR=$datadir
EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"` EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"`
EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"` EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"`
@ -42,7 +50,7 @@
exec_prefix=$old_exec_prefix exec_prefix=$old_exec_prefix
libdir=$old_libdir libdir=$old_libdir
@@ -1460,7 +1453,7 @@ PHP_SUBST(all_targets) @@ -1434,7 +1428,7 @@ PHP_SUBST(all_targets)
PHP_SUBST(install_targets) PHP_SUBST(install_targets)
PHP_SUBST(install_binary_targets) PHP_SUBST(install_binary_targets)

View file

@ -1,12 +0,0 @@
--- main/php_config.h.in.orig 2016-07-20 13:12:32 UTC
+++ main/php_config.h.in
@@ -2426,6 +2426,9 @@
/* Define if processor uses big-endian word */
#undef WORDS_BIGENDIAN
+/* Include external shared modules configurations */
+#include "ext/php_config.h"
+
/* Whether sprintf is broken */
#undef ZEND_BROKEN_SPRINTF