From 11ca07f4fcf2a494e34f69fa036808af4df23217 Mon Sep 17 00:00:00 2001 From: Mathieu Arnold Date: Thu, 23 Jun 2016 13:19:17 +0000 Subject: Move bsd.php.mk to Uses/php.mk PR: 210323 Submitted by: mat Exp-run by: antoine Sponsored by: Absolight Differential Revision: https://reviews.freebsd.org/D6867 --- lang/php55/Makefile | 2 ++ lang/php56/Makefile | 2 ++ lang/php70/Makefile | 4 +++- 3 files changed, 7 insertions(+), 1 deletion(-) (limited to 'lang') diff --git a/lang/php55/Makefile b/lang/php55/Makefile index 1f23b4f7839d..3a6d92241113 100644 --- a/lang/php55/Makefile +++ b/lang/php55/Makefile @@ -185,6 +185,8 @@ post-build: @${ECHO_CMD} "PHP_VERSION=${PORTVERSION}" >> ${WRKDIR}/php.conf @${ECHO_CMD} "PHP_SAPI=${PHP_SAPI}" >> ${WRKDIR}/php.conf @${ECHO_CMD} "PHP_EXT_INC=pcre spl" >> ${WRKDIR}/php.conf + @${ECHO_CMD} -n "PHP_EXT_DIR=" >> ${WRKDIR}/php.conf + @${SH} ${WRKSRC}/scripts/php-config --extension-dir | sed -ne 's,^${PREFIX}/lib/php/,,p' >> ${WRKDIR}/php.conf test: build @(cd ${WRKSRC} && ${MAKE} test) diff --git a/lang/php56/Makefile b/lang/php56/Makefile index dce16584b92d..41705c1004a7 100644 --- a/lang/php56/Makefile +++ b/lang/php56/Makefile @@ -188,6 +188,8 @@ post-build: @${ECHO_CMD} "PHP_VERSION=${PORTVERSION}" >> ${WRKDIR}/php.conf @${ECHO_CMD} "PHP_SAPI=${PHP_SAPI}" >> ${WRKDIR}/php.conf @${ECHO_CMD} "PHP_EXT_INC=pcre spl" >> ${WRKDIR}/php.conf + @${ECHO_CMD} -n "PHP_EXT_DIR=" >> ${WRKDIR}/php.conf + @${SH} ${WRKSRC}/scripts/php-config --extension-dir | sed -ne 's,^${PREFIX}/lib/php/,,p' >> ${WRKDIR}/php.conf test: build @(cd ${WRKSRC} && ${MAKE} test) diff --git a/lang/php70/Makefile b/lang/php70/Makefile index 5b2684c23208..f0c01f8419f4 100644 --- a/lang/php70/Makefile +++ b/lang/php70/Makefile @@ -169,19 +169,21 @@ post-patch: ${WRKSRC}/sapi/fpm/php-fpm.conf.in .endif +# Work around issues with newer (>=2.64) autoconf pre-configure: @${REINPLACE_CMD} -E 's:^((m4_)?divert)[(]([0-9]*)[)]:\1(600\3):' \ ${WRKSRC}/configure.in `${FIND} ${WRKSRC} -name '*.m4'` @${RM} ${WRKSRC}/configure @${CAT} ${WRKSRC}/acinclude.m4 ${WRKSRC}/build/libtool.m4 > ${WRKSRC}/aclocal.m4 - .if !defined(PKGNAMEPREFIX) post-build: @${ECHO_CMD} "PHP_VER=70" > ${WRKDIR}/php.conf @${ECHO_CMD} "PHP_VERSION=${PORTVERSION}" >> ${WRKDIR}/php.conf @${ECHO_CMD} "PHP_SAPI=${PHP_SAPI}" >> ${WRKDIR}/php.conf @${ECHO_CMD} "PHP_EXT_INC=pcre spl" >> ${WRKDIR}/php.conf + @${ECHO_CMD} -n "PHP_EXT_DIR=" >> ${WRKDIR}/php.conf + @${SH} ${WRKSRC}/scripts/php-config --extension-dir | sed -ne 's,^${PREFIX}/lib/php/,,p' >> ${WRKDIR}/php.conf test: build @(cd ${WRKSRC} && ${MAKE} test) -- cgit v1.2.3