From nobody Sun Apr 03 21:39:27 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 869BF1A42CE2; Sun, 3 Apr 2022 21:39:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KWnNv3LgYz3sgs; Sun, 3 Apr 2022 21:39:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649021967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lmiMjo2YNMW9NZAWJOzaatOQLaDjkrS0wREqwtILA0c=; b=FKAn8iSqsf3KzLS2rO9AK0SKBf/Y4EXBHC5y5XtNtmahpB9fQc+ncpWdRY3gasPL9AYjwC 67dktSKpdVx/vWh1TGXbG+4ArnoD+aq43sSxlokyVRS9fX/CZRkevIJe+W8ylkjBBU9j49 +N8tGawY7v1H0N7TQtFMpjM6JrC5lG1Um0HNI9K1F9o9MduB1ioiuC9BXhSFRRM9uqPvje vv6WiQv4FtdMUvvbIp2k8rjZepRJi5F8XC8QIOm57wrMkEHRgPQrVVcH3d3qjDbtq3WpH5 OnPtX2rAMT2ppu0CXqDgo0ZfsR8j+4vHackS0HhWeeArRd9y2HU7KLl9LimxAw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 53C53250D9; Sun, 3 Apr 2022 21:39:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 233LdRZV094690; Sun, 3 Apr 2022 21:39:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 233LdRED094689; Sun, 3 Apr 2022 21:39:27 GMT (envelope-from git) Date: Sun, 3 Apr 2022 21:39:27 GMT Message-Id: <202204032139.233LdRED094689@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 945dec8fbd3b - main - Uses/php.mk: Helper variable to disable FLAVOR List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 945dec8fbd3bad12712c0f80d8215935818c9292 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649021967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lmiMjo2YNMW9NZAWJOzaatOQLaDjkrS0wREqwtILA0c=; b=lUxvET+zLavPh3IBdr0zQfpaAHXqExsvRNSxCo4oK/95x9G69ORxxjnfQxSQ8YRqOk8G4r p6fI1pvtojF7u8QPCXRqp1yHv2BxRGghfG9Idy3DWpf5emPFhyMfP+ySwXk8Vkxaf6xRfO 5Z22MP0Ll6henKiOxJhON1grnv8YQ8KuhBNEE8BTtz97hu2j7/ryrdnJr8vaIgqWpqRfmC yB3Cik7wsem/XU8AWp0gxqcdpYJgs6EqDXmdWSHt1lxs935VCRrMq721/slDQnBvBo4lv5 mKml6WioWyA9DW3T/5my2f5EVdE88GkhMuY/678xjWlHKO42jCke+abXWE5wKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649021967; a=rsa-sha256; cv=none; b=WJhc5LzkZTSVDnNCKiX/4aoyrnxwHJc8RNw49Ie654leGQa3tar2XOGEOtMQklBDUvlHrp qozTJ/x23UPeeEuugLh69cTmixbD0cocBSKTA1tAQHOvw5FpDY//lCwHFh5AC0NR8DOgeg ljnmPwk9FRj6Mm5jqiuw6iBevVYbU/zIwEmEJydE9egahxT29X/8ifgkBvwSPsxaZnOi0w P4+ruukk4TL/BlzXF2riDsPvrNpF8+ntcD7ymDBoskMUiEYGvo5QwmwyB/HKv4MYhY6uoQ j1dD21DMK/7vZUsWxn/V3r2zZTLkefUGqgJMSJkzgBOkissbCecvwvks25tOog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=945dec8fbd3bad12712c0f80d8215935818c9292 commit 945dec8fbd3bad12712c0f80d8215935818c9292 Author: Muhammad Moinur Rahman AuthorDate: 2022-04-03 21:33:58 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2022-04-03 21:33:58 +0000 Uses/php.mk: Helper variable to disable FLAVOR - Currently our php.mk is defined in such a way that when testing with poudriere if a port do not support the PHP default version it tries to build with a different php version that the port supports. Unfortunately this behavior is not too much helpful when we want to add/remove a old/new php version as it doesn't gives a clear picture of which ports fails to build with a specific PHP version. So this patch defines a variable "BUILD_ONLY_DEFAULT_PHP_FLAVOR". If this variable is defined in make.conf then poudriere will build with default flavor and in case it's not supported this will IGNORE/SKIP the port which gives a clear overview of which ports are going to create problem while adding/removing/changing default php. - One more thing is there are some old php modules still listed specifically dbase_DEPENDS, mssql_DEPENDS and sybase_ct_DEPENDS which are actually no longer in the tree. PR: 262639 Approved by: ale (maintainer-timeout) Sponsored by: Bounce Experts --- Mk/Uses/php.mk | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Mk/Uses/php.mk b/Mk/Uses/php.mk index 45506538273d..9940d7fba047 100644 --- a/Mk/Uses/php.mk +++ b/Mk/Uses/php.mk @@ -47,6 +47,8 @@ # # IGNORE_WITH_PHP=N - The port doesn't work with PHP version N. # +# BUILD_ONLY_DEFAULT_PHP_FLAVOR - explicitely marks non-default ignored (use in make.conf) +# # You may combine multiple php:* arguments. # Don't specify any php:* argument if your port will work with every PHP SAPI. # @@ -128,9 +130,14 @@ IGNORE= does not work with PHP versions "${IGNORE_WITH_PHP}" and "${_INSTALLED_P PHP_VER?= ${PHP_DEFAULT:S/.//} . endif # .if exists(${PHPBASE}/etc/php.conf) +.if defined(BUILD_ONLY_DEFAULT_PHP_FLAVOR) +# Only build php ports of the default flavor +_ALL_FLAVOR_VERSIONS= ${PHP_VER} +.else # Use the "default" php version as the first version for flavors, so that it # gets to be the default flavor. _ALL_FLAVOR_VERSIONS= ${PHP_VER} ${_ALL_PHP_VERSIONS:N${PHP_VER}} +.endif # If we want flavors, fill in FLAVORS with the allowed PHP versions, if some # cannot be used, or all of them if they all can. @@ -392,7 +399,6 @@ calendar_DEPENDS= misc/php${PHP_VER}-calendar ctype_DEPENDS= textproc/php${PHP_VER}-ctype curl_DEPENDS= ftp/php${PHP_VER}-curl dba_DEPENDS= databases/php${PHP_VER}-dba -dbase_DEPENDS= databases/php${PHP_VER}-dbase dom_DEPENDS= textproc/php${PHP_VER}-dom enchant_DEPENDS= textproc/php${PHP_VER}-enchant exif_DEPENDS= graphics/php${PHP_VER}-exif @@ -415,7 +421,6 @@ mbstring_DEPENDS= converters/php${PHP_VER}-mbstring mcrypt_DEPENDS= security/pecl-mcrypt@${PHP_FLAVOR} memcache_DEPENDS= databases/pecl-memcache@${PHP_FLAVOR} memcached_DEPENDS= databases/pecl-memcached@${PHP_FLAVOR} -mssql_DEPENDS= databases/php${PHP_VER}-mssql mysqli_DEPENDS= databases/php${PHP_VER}-mysqli odbc_DEPENDS= databases/php${PHP_VER}-odbc opcache_DEPENDS= www/php${PHP_VER}-opcache @@ -446,7 +451,6 @@ soap_DEPENDS= net/php${PHP_VER}-soap sockets_DEPENDS=net/php${PHP_VER}-sockets sodium_DEPENDS= security/php${PHP_VER}-sodium sqlite3_DEPENDS=databases/php${PHP_VER}-sqlite3 -sybase_ct_DEPENDS= databases/php${PHP_VER}-sybase_ct sysvmsg_DEPENDS=devel/php${PHP_VER}-sysvmsg sysvsem_DEPENDS=devel/php${PHP_VER}-sysvsem sysvshm_DEPENDS=devel/php${PHP_VER}-sysvshm