From nobody Tue Jun 13 20:13:34 2023 X-Original-To: dev-commits-ports-main@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 4QgfrZ4yQNz4dj66; Tue, 13 Jun 2023 20:13:34 +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 4QgfrZ4GGmz3n9K; Tue, 13 Jun 2023 20:13:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686687214; 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=YfEtwW3iMBzA38r1e4Bcv9Ss+XooONISWnOUeroIbV0=; b=qhcpDhAc3oSeIDtehIcYql3KumjE0iPdzWzeF7X6chBRSYgOGtajl39EWJJB0TpAJrTtav jpqYbSGO3Qu4FgbCMesksdOD4FYDMnKugz1dt+qzz49eGx3GbGs89U91qH+sCPASHfE0DF UDmu1XrAEJHtuyVCQgNw5za/enKsQl91zI8IZDtK6sygxExs5Se842SIsG+ng8FQOUPEpi 4KtX1yZCyNZxogIprz0nkHRhFhZq+GonJxlcMd8lMzs6hjbuJfy4rt0+Lb0GXWzQb5IgnC c0W5XjWzx26I4BZm34uvqM7aY8GDoBAueHvB15SfePdZbc/Ym/u2SpYYSp/ZRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686687214; 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=YfEtwW3iMBzA38r1e4Bcv9Ss+XooONISWnOUeroIbV0=; b=OPac017uuMn5LLKNpWTC3eFwYykLDGpf0m312K/ka/mbNPBP79JKMZxDoaRmtigjMfZ+mG tqp1H2kZOPKQMEHpjPfBBac9g1tVkZDAHCyXt8khDAoahBo8lbn28Qc+ekHwwrtimIpzb7 mPipblxteS6KwUGqmp83LGao/tmrx6GJDb71YGAV2OGB22/MzSD9PwNCN3E1xlfThsdSns tWYA4jRDkc6+DF5FjIenqhzzk8gVeseYoI9o+0/h3mBEtqAHAKN9tyfaL4ytCrhDpXONao nqsgFmLEl8MuN84xJzxzDrnoHI3oPtypnYD5HwVD79scyqFcJ3mf01WVER3ZFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686687214; a=rsa-sha256; cv=none; b=u2XG+s/MQ8sEB+a2jcaCmZu6ieV4lOd2oTWhd7KX8qm3JKYC3e3mt8GdDgSFg23gXDgc45 PyOLHMm9R73DEmdPuU3brGefUEGdUhqlc+sQW3LEdHrVUUxMULdg3OzKWEJSzW8VjXd0Zb SW4nkwHn7Z1lqwJAIX+EVUVO+edwD4RH/s31lTQaROXAUCkSvRO4SQOub6rWU4gxhynFHO NAvjDULGDbCT9Z5tA1lRFaQ9+q/PY/ZCW7fyXHuPPShH30IPlk8gNnBIT+pg8OusRzJ9ET cOiVwcmTD3WvycEZwfWd5UujL1N9GLNbi1IH3awjFSSfGKVYYWhrTx833eXUlA== 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 4QgfrZ3L0TzbMm; Tue, 13 Jun 2023 20:13:34 +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 35DKDYZN002646; Tue, 13 Jun 2023 20:13:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35DKDYan002645; Tue, 13 Jun 2023 20:13:34 GMT (envelope-from git) Date: Tue, 13 Jun 2023 20:13:34 GMT Message-Id: <202306132013.35DKDYan002645@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Luca Pizzamiglio Subject: git: 873d4f6f9905 - main - Mk/Scripts: Fix ports depends-list.sh List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pizzamig X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 873d4f6f9905bae3fe580e86aaebbbe994adba97 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pizzamig: URL: https://cgit.FreeBSD.org/ports/commit/?id=873d4f6f9905bae3fe580e86aaebbbe994adba97 commit 873d4f6f9905bae3fe580e86aaebbbe994adba97 Author: Andrew "RhodiumToad" Gierth AuthorDate: 2023-06-13 20:09:59 +0000 Commit: Luca Pizzamiglio CommitDate: 2023-06-13 20:09:59 +0000 Mk/Scripts: Fix ports depends-list.sh depends-list.sh fails in two ways: one is a simple quoting bug which causes empty FLAVOR variables to be propagated; the other is that de-duplication is being done without regard for flavors. The upshot of these is that where a port depends on a specific flavor (first bug) or on multiple flavors (second bug, usually caused by build dependencies) of another port, the constructed dependency list is incomplete, and so -recursive targets do not do all the required work. (This is especially annoying for fetch-recursive.) Reviewed by: portmgr@FreeBSD.org PR: 269982 Differential Revision: https://reviews.freebsd.org/D40491 --- Mk/Scripts/depends-list.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Mk/Scripts/depends-list.sh b/Mk/Scripts/depends-list.sh index 6c3e03c33288..ab724b58ab1e 100644 --- a/Mk/Scripts/depends-list.sh +++ b/Mk/Scripts/depends-list.sh @@ -76,7 +76,7 @@ check_dep() { ;; esac if [ -f ${d}/Makefile ]; then - if [ -n $f ]; then + if [ -n "$f" ]; then export FLAVOR=$f fi break @@ -91,9 +91,9 @@ check_dep() { fi case " ${checked} " in - *\ ${d}\ *) continue ;; # Already checked + *\ ${port_display}\ *) continue ;; # Already checked esac - checked="${checked} ${d}" + checked="${checked} ${port_display}" # Check if the dependency actually exists or skip otherwise. if [ ! -d "${d}" ]; then echo "${dp_PKGNAME}: \"${port_display}\" non-existent -- dependency list incomplete" >&2