Date: Tue, 25 Jan 2022 09:21:59 GMT From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: ed26168a5c83 - main - Fix libphp name in php.mk Message-ID: <202201250921.20P9LxUJ068709@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=ed26168a5c8380b2bc81ff3cd460f7ff44458ebf commit ed26168a5c8380b2bc81ff3cd460f7ff44458ebf Author: Mark Burdett <mfburdett@gmail.com> AuthorDate: 2022-01-25 09:17:22 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> CommitDate: 2022-01-25 09:21:38 +0000 Fix libphp name in php.mk - From php80 and onwards libphp name is libphp.so without the major version number. Add a check to fix the RUN_DEPENDS. PR: 251252 Reported by: jonaspalm@posteo.de Approved by: ale (maintainer) Sponsored by: Bounce Experts --- Mk/Uses/php.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Mk/Uses/php.mk b/Mk/Uses/php.mk index 8f1dd7cc6375..bf3a48b3bd71 100644 --- a/Mk/Uses/php.mk +++ b/Mk/Uses/php.mk @@ -275,8 +275,12 @@ RUN_DEPENDS+= ${PHPBASE}/include/php/main/php.h:${PHP_PORT} . if ${php_ARGS:Mmod} || (${php_ARGS:Mweb} && defined(PHP_VERSION) && ${PHP_SAPI:Mcgi} == "" && ${PHP_SAPI:Mfpm} == "") USE_APACHE_RUN= 22+ .include "${PORTSDIR}/Mk/Uses/apache.mk" +. if ${PHP_VER} < 80 # libphpX.so only has the major version number in it, so remove the last digit of PHP_VER to get it. RUN_DEPENDS+= ${PHPBASE}/${APACHEMODDIR}/libphp${PHP_VER:C/.$//}.so:${MOD_PHP_PORT} +. else +RUN_DEPENDS+= ${PHPBASE}/${APACHEMODDIR}/libphp.so:${MOD_PHP_PORT} +. endif . endif PLIST_SUB+= PHP_EXT_DIR=${PHP_EXT_DIR}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202201250921.20P9LxUJ068709>