From nobody Wed Mar 6 20:25:15 2024 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 4TqkSr0C9Xz5DFmm; Wed, 6 Mar 2024 20:25:16 +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 4TqkSq6DgVz4FlM; Wed, 6 Mar 2024 20:25:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709756715; 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=jEH3lVX/aL4Np9qkJYOd3CiaXlWfYXrd8olauer4GKo=; b=LDkErYKFxE8+dygnk6Etr5KOvg7DmM1SdZFsxOQ+gzvv1R0qN8MMiy9CblgJcZvazVnt7h QCmHmKUY8VHhFmEQwEvzudBJ2/JRxXUXx62lGHVT+ebgPgfT4IKyF7i6kuHPTtSSFmPjKf 33njSQ8m7UBcJTZByyDPAMK4m7/vmsk3dD+XHjCQqfWUXuIuwL5L8YJvaBfzutGRQgvxlV LTDLFH6l7+uVJhgacbk9iSNymd5tGCIwSZrBPkZuZu1V8o3CcfifiNxrwYBkA9mEKq7LIf q7IcDWhAojsC9xkNyFV+zU3C38Mck9Z8UV8sA8hO489g4HG+r2xGGcy9Fe+VTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709756715; a=rsa-sha256; cv=none; b=fFnMGvn9xTfCMUWjzIHLanVxtx3KBbrPGAnnMjeNmuXUP8SMWBtIKwx3dF33+GGIphNZ6w w5U3vBrhRgb3okO7kxeIpNj5WecQrBtjiZ1F/kTtkoB51zU/aIU3+pPhGYQkN7Rpv2WqgY emd5PVNWLGOhclCe1+04Yr8s152cORL74Nb69BVDG64z3+9K+yTAYKrzodasolCwL9x6bM keG3V8lF9muiAEzpjNoaOcJ8nK/5dJqF5Uc8AV0SxQ1Rdni/EL7eXfPgh64OqGiPbIWwOY I+3kf/KvKY1bBiPROyf3+YFWvChpUbZuwBry3MBhojT4H8ZmxoeHvrDb6APP/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709756715; 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=jEH3lVX/aL4Np9qkJYOd3CiaXlWfYXrd8olauer4GKo=; b=mAYhdrLFD+CpZijoeATK1ek90veSrZlJexTFNPKIzJALGXc3Ruy9/pV3aNGt9v2puoW12d AFtzKCoFvcbg3QJjDCjnLNRVY44ccbIhnDl8Ko1w4ykGwNottKlks0f8J2moTU3akDkstS D2bDR2c5y9M1zVS7kMnuq/K3A27GuPWegUH0Cm+q+EoUiXbRkAMFon6ask+IaTShfOLrbQ JuWxcRc+nGSyvYRDIanJgaSIFW2CETZ9zGK5Z54RNJwhLc1Ocz96+IYirLQjU8c7KRoxAh UZ5FADnVncWH79QvhUJq2iVUQGtr4KSG66xhH7VuDwyo55aMkBXyNgSpRktUdw== 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 4TqkSq5k36z13t3; Wed, 6 Mar 2024 20:25:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 426KPF3C031668; Wed, 6 Mar 2024 20:25:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 426KPF3M031665; Wed, 6 Mar 2024 20:25:15 GMT (envelope-from git) Date: Wed, 6 Mar 2024 20:25:15 GMT Message-Id: <202403062025.426KPF3M031665@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Tijl Coosemans Subject: git: 830ec3717024 - main - Mk/Scripts/do-depends.sh: Avoid make -D flag 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: tijl X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 830ec3717024e0060b2b48db4319a4eb060f8023 Auto-Submitted: auto-generated The branch main has been updated by tijl: URL: https://cgit.FreeBSD.org/ports/commit/?id=830ec3717024e0060b2b48db4319a4eb060f8023 commit 830ec3717024e0060b2b48db4319a4eb060f8023 Author: Tijl Coosemans AuthorDate: 2024-03-06 19:13:39 +0000 Commit: Tijl Coosemans CommitDate: 2024-03-06 20:22:21 +0000 Mk/Scripts/do-depends.sh: Avoid make -D flag Both FreeBSD make and GNU make pass command line flags to sub-makes through the MAKEFLAGS environment variable, but the flags aren't compatible and GNU make 4.4 exits with an error when it encounters flags it doesn't understand, e.g. -D. Avoid using the flag for now until ports run gmake with SETENVI. This fixes the case where a port is built using make directly and it recurses to build a dependency that uses gmake. Poudriere does not use this feature of the ports tree to build dependencies so it's not affected. PR: 272216, 277492 --- Mk/Scripts/do-depends.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Mk/Scripts/do-depends.sh b/Mk/Scripts/do-depends.sh index 238a8f221b18..c01bd8c16965 100644 --- a/Mk/Scripts/do-depends.sh +++ b/Mk/Scripts/do-depends.sh @@ -24,7 +24,7 @@ install_depends() subpkg=$3 depends_args=$4 if [ -z "${dp_USE_PACKAGE_DEPENDS}" -a -z "${dp_USE_PACKAGE_DEPENDS_ONLY}" ]; then - MAKEFLAGS="${dp_MAKEFLAGS}" ${dp_MAKE} -C ${origin} -DINSTALLS_DEPENDS ${target} ${depends_args} + INSTALLS_DEPENDS=1 MAKEFLAGS="${dp_MAKEFLAGS}" ${dp_MAKE} -C ${origin} ${target} ${depends_args} return 0 fi @@ -53,7 +53,7 @@ install_depends() echo "===> USE_PACKAGE_DEPENDS_ONLY set - not building missing dependency from source" >&2 exit 1 else - MAKEFLAGS="${dp_MAKEFLAGS}" ${dp_MAKE} -C ${origin} -DINSTALLS_DEPENDS ${target} ${depends_args} + INSTALLS_DEPENDS=1 MAKEFLAGS="${dp_MAKEFLAGS}" ${dp_MAKE} -C ${origin} ${target} ${depends_args} fi }