pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/lang/php74



Module Name:    pkgsrc
Committed By:   otis
Date:           Sat Nov 21 19:42:25 UTC 2020

Modified Files:
        pkgsrc/lang/php74: Makefile.php

Log Message:
php74: Make php-embed a no-op for other than main php package

This avoids the situation when more than one SAPI is requested to build,
which is unsupported (only one of fpm, filter, module) can be built at
once.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/php74/Makefile.php

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/php74/Makefile.php
diff -u pkgsrc/lang/php74/Makefile.php:1.3 pkgsrc/lang/php74/Makefile.php:1.4
--- pkgsrc/lang/php74/Makefile.php:1.3  Fri Nov 20 15:13:31 2020
+++ pkgsrc/lang/php74/Makefile.php      Sat Nov 21 19:42:25 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.3 2020/11/20 15:13:31 otis Exp $
+# $NetBSD: Makefile.php,v 1.4 2020/11/21 19:42:25 otis Exp $
 # used by lang/php74/Makefile
 # used by www/ap-php/Makefile
 # used by www/php-fpm/Makefile
@@ -111,6 +111,7 @@ CFLAGS+=            -DDISABLE_FILTER_URL
 
 PLIST_VARS+=    embed
 
+.if !empty(PKGNAME:Mphp-[7-9]*)
 .if !empty(PKG_OPTIONS:Mphp-embed)
 CONFIGURE_ARGS+=       --enable-embed
 INSTALLATION_DIRS+=    include/php/sapi/embed
@@ -122,6 +123,7 @@ post-install-embed:
        ${INSTALL_DATA} ${WRKSRC}/sapi/embed/php_embed.h ${DESTDIR}${PREFIX}/include/php/sapi/embed/
        ${INSTALL_LIB} ${WRKSRC}/libs/libphp7.so ${DESTDIR}${PREFIX}/lib/
 .endif
+.endif
 
 DL_AUTO_VARS=          yes
 .include "../../mk/dlopen.buildlink3.mk"



Home | Main Index | Thread Index | Old Index