diff options
| author | jdolecek <jdolecek> | 2016-07-26 08:19:45 +0000 |
|---|---|---|
| committer | jdolecek <jdolecek> | 2016-07-26 08:19:45 +0000 |
| commit | 2165cd748c6573a2977234d6ae238abe00f5e7bf (patch) | |
| tree | d86c2ffc39ea943c4199dfb8fe265d5b66a1133e | |
| parent | 855f60559f84100caeeff4748873e65bf9c58194 (diff) | |
| download | pkgsrc-2165cd748c6573a2977234d6ae238abe00f5e7bf.tar.gz | |
further tweak the generated ini files - they are now named according to MODNAME, but use PKGMODNAME as the base for extension file to load; this deals with modules like apcu_bc, which has extension name 'apc', but needs to be loaded after 'apcu' since it uses it's symbols
| -rw-r--r-- | lang/php/PLIST.module | 4 | ||||
| -rw-r--r-- | lang/php/ext.mk | 13 |
2 files changed, 9 insertions, 8 deletions
diff --git a/lang/php/PLIST.module b/lang/php/PLIST.module index 693012c7675..3113fb1673b 100644 --- a/lang/php/PLIST.module +++ b/lang/php/PLIST.module @@ -1,3 +1,3 @@ -@comment $NetBSD: PLIST.module,v 1.2 2016/07/17 15:49:44 jdolecek Exp $ +@comment $NetBSD: PLIST.module,v 1.3 2016/07/26 08:19:45 jdolecek Exp $ share/examples/php/${MODNAME}.ini -${PHP_EXTENSION_DIR}/${MODNAME}.${SHLIB_SUFFIX} +${PHP_EXTENSION_DIR}/${PKGMODNAME}.${SHLIB_SUFFIX} diff --git a/lang/php/ext.mk b/lang/php/ext.mk index 67c36652d95..f17f23f5f10 100644 --- a/lang/php/ext.mk +++ b/lang/php/ext.mk @@ -1,4 +1,4 @@ -# $NetBSD: ext.mk,v 1.41 2016/07/24 14:01:55 jdolecek Exp $ +# $NetBSD: ext.mk,v 1.42 2016/07/26 08:19:45 jdolecek Exp $ # # PHP extension package framework, for both PECL and bundled PHP extensions. # @@ -28,7 +28,8 @@ HOMEPAGE?= http://pecl.php.net/package/${MODNAME} PKGMODNAME?= ${MODNAME:S/-/_/} PHPSETUPSUBDIR?= #empty MODULESDIR?= ${WRKSRC}/modules -PLIST_SUBST+= MODNAME=${PKGMODNAME} +PLIST_SUBST+= MODNAME=${MODNAME} +PLIST_SUBST+= PKGMODNAME=${PKGMODNAME} PLIST_SUBST+= SHLIB_SUFFIX=${SHLIB_SUFFIX} PLIST_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} @@ -49,14 +50,14 @@ EXTRACT_SUFX?= .tgz .endif EGDIR= ${PREFIX}/share/examples/php -CONF_FILES= ${EGDIR}/${PKGMODNAME}.ini ${EXT_CONF_DIR}/${PKGMODNAME}.ini +CONF_FILES= ${EGDIR}/${MODNAME}.ini ${EXT_CONF_DIR}/${MODNAME}.ini EXT_CONF_DIR= ${PKG_SYSCONFDIR}/php.d MAKE_DIRS+= ${EXT_CONF_DIR} MAKE_DIRS+= ${EGDIR} SUBST_CLASSES+= ext-ini -SUBST_FILES.ext-ini= ${PKGMODNAME}.ini +SUBST_FILES.ext-ini= ${MODNAME}.ini SUBST_MESSAGE.ext-ini=Creating module ini file SUBST_SED.ext-ini+= -e 's,@MODNAME@,${PKGMODNAME},g' SUBST_SED.ext-ini+= -e 's,@EXTENSION_FILE@,${EXTENSION_FILE},g' @@ -119,7 +120,7 @@ phpize-module: fi pre-build: - ${CP} ${.CURDIR}/../../lang/php/ext.ini ${WRKSRC}/${PKGMODNAME}.ini + ${CP} ${.CURDIR}/../../lang/php/ext.ini ${WRKSRC}/${MODNAME}.ini do-install: do-module-install @@ -129,7 +130,7 @@ do-module-install: ${DESTDIR}${PREFIX}/${PHP_EXTENSION_DIR} ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR} - ${INSTALL_DATA} ${WRKSRC}/${PKGMODNAME}.ini ${DESTDIR}${EGDIR} + ${INSTALL_DATA} ${WRKSRC}/${MODNAME}.ini ${DESTDIR}${EGDIR} .if defined(USE_PHP_EXT_PATCHES) PATCHDIR= ${.CURDIR}/${PHPPKGSRCDIR}/patches |