Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 7973E1A923F for ; Sat, 21 Nov 2020 19:43:59 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id DFE8985158; Sat, 21 Nov 2020 19:43:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 1A9EA85157 for ; Sat, 21 Nov 2020 19:43:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id ZLdagNDYdh4R for ; Sat, 21 Nov 2020 19:43:57 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 6A6A885155 for ; Sat, 21 Nov 2020 19:43:57 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 67066FA9D; Sat, 21 Nov 2020 19:43:57 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1605987837257040" MIME-Version: 1.0 Date: Sat, 21 Nov 2020 19:43:57 +0000 From: "Juraj Lutter" Subject: CVS commit: pkgsrc/lang/php73 To: pkgsrc-changes@NetBSD.org Reply-To: otis@netbsd.org X-Mailer: log_accum Message-Id: <20201121194357.67066FA9D@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1605987837257040 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: otis Date: Sat Nov 21 19:43:57 UTC 2020 Modified Files: pkgsrc/lang/php73: Makefile.php Log Message: php73: 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.5 -r1.6 pkgsrc/lang/php73/Makefile.php Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1605987837257040 Content-Disposition: inline Content-Length: 1008 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/php73/Makefile.php diff -u pkgsrc/lang/php73/Makefile.php:1.5 pkgsrc/lang/php73/Makefile.php:1.6 --- pkgsrc/lang/php73/Makefile.php:1.5 Fri Nov 20 15:34:11 2020 +++ pkgsrc/lang/php73/Makefile.php Sat Nov 21 19:43:57 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.php,v 1.5 2020/11/20 15:34:11 otis Exp $ +# $NetBSD: Makefile.php,v 1.6 2020/11/21 19:43:57 otis Exp $ # used by lang/php73/Makefile # used by www/ap-php/Makefile # used by www/php-fpm/Makefile @@ -112,6 +112,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 @@ -123,6 +124,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" --_----------=_1605987837257040--