From nobody Thu Apr 24 15:25:26 2025 X-Original-To: dev-commits-src-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 4Zk0Cq2GrGz5tRSJ; Thu, 24 Apr 2025 15:25: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zk0Cq0KX4z3qSd; Thu, 24 Apr 2025 15:25:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745508327; 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=w7FzF84Ao52jHUUKccxTg/FxsoUdsadizoPA9BQPuGE=; b=bGzK7/Hp5UB4tLr9bUvv4NMZAR/vgmzm4dvH0XfLa0NwfoAwNYApUTMVsNgzJziCiJCxK5 mYqhttP0FDoJ3WOqJ/yJiv9G9qFo8HfAzO8cRINWJ5dxUEHsf+CL+MLP/w/HvPTZ1eB8f7 xIxwLz1zC1bwbSVtGDt5aALyrvX90mrwSiWtI/tnbE2aHvH9kQyORsC+p52xG4Q3baskoR KEUO4DhxWKw8wlSJLY9R4MF7x9ThSCqG/9BSyhG288wNC3EbBOLb1yN4F3WsB5a2kf0Rez WRiwiZxXPjqcN07R+OP1EdHuOnARg3AAfKJnKSHOAkQwREJOB/i1BOaiGBkukQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745508327; a=rsa-sha256; cv=none; b=J7+180o9o3teda0IF6nW8BoryP2LZbhr0FcFyRE49UN+qOAV1XDIenaoHQ0G6UxN5cBb6v WjtCvppMJpXG9+9OEprFdJc+6Se/3q4zgFxYVn3xhTbFH/KlXKPNsmcQCW1T7W+5iUYgbk 3JvndQryqzgvJ+16YvmOKjnX4Y9iNoOW5J/SHr9l04UHUVePRITs8Y5vy09cgusyvaKm4A lk7Xxe8Hbh6EndUL5wQbeiA2KmLREJkfCGiLVp9B2EBIEzSYfLEdvGhSqY7hHyUtSvPSR7 3B+Vy6M0g1qIINHhLU1Yl5hz2ZO8ygyRCEeLQnjVDleNBeAqd7rWNc6iVcXL6w== 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=1745508327; 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=w7FzF84Ao52jHUUKccxTg/FxsoUdsadizoPA9BQPuGE=; b=TgTb0ekELCzJiMthz+R4EHBoxwnt31T14r/E7uFqRLXShHcf9jmCPuUPsokUcg7yirczlI pomeEPcZWocTE7NEhH9mf+ohQh+uDFkrElYqlP5Opno+pwA4BqZ1tidWC2BTKwRK42WWHn HuqwI2HZLrKNbjFn1DezrlayRci5qk4gZwXg4Z2vWCWCwy+PjQ/ckcPHoBM8vO7g/rJ8mg kC9rFhFDSPasVKS2Dma52+1mc4Ixra+yUwuHIBs35xDxSKagMSa/rgwDWaJHVbzqDdapKX bhcPPVtk1VdeTm2RhKtRAsSJ85RzCdjnhAsWMQm/YI2DZVeUQwkjtEXLeFzU0A== 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 4Zk0Cp5wFFzvyQ; Thu, 24 Apr 2025 15:25:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53OFPQUt069805; Thu, 24 Apr 2025 15:25:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53OFPQNb069802; Thu, 24 Apr 2025 15:25:26 GMT (envelope-from git) Date: Thu, 24 Apr 2025 15:25:26 GMT Message-Id: <202504241525.53OFPQNb069802@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 5e1249009d25 - stable/14 - zoneinfo: fix makefile rules script List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5e1249009d25effff1a4b47ba0925a93d8324f30 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=5e1249009d25effff1a4b47ba0925a93d8324f30 commit 5e1249009d25effff1a4b47ba0925a93d8324f30 Author: Stephen J. Kiernan AuthorDate: 2023-11-15 00:38:47 +0000 Commit: Ed Maste CommitDate: 2025-04-24 14:01:57 +0000 zoneinfo: fix makefile rules script In make target rules, one needs to use subshell if there are change directory commands that should only have an effect on the other commands in the same line. Otherwise, if make is not running in compatibility mode (for example, when -j flag is specified), commands would be executed in a single shell and lines following the "cd" might not work as expected. Adjust the target script lines that use "cd" to run in a subshell by adding appropriate parenthesis. Reviewed by: sjg Differential Revision: https://reviews.freebsd.org/D42608 (cherry picked from commit fa08011a521c1f15ca44d6a4f30a318d0a37a3a7) --- share/zoneinfo/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/share/zoneinfo/Makefile b/share/zoneinfo/Makefile index f2f14c01c7be..60ae1f76f5b5 100644 --- a/share/zoneinfo/Makefile +++ b/share/zoneinfo/Makefile @@ -93,10 +93,10 @@ ZIC= ${STAGE_HOST_OBJTOP}/usr/sbin/zic zoneinfo: ${TDATA} mkdir -p ${TZBUILDDIR} - cd ${TZBUILDDIR}; mkdir -p ${TZBUILDSUBDIRS} - umask 022; cd ${.CURDIR}; \ + (cd ${TZBUILDDIR}; mkdir -p ${TZBUILDSUBDIRS}) + (umask 022; cd ${.CURDIR}; \ ${ZIC:Uzic} -D -d ${TZBUILDDIR} ${ZICFLAGS} -m ${NOBINMODE} \ - ${LEAPFILE} ${TZFILES} + ${LEAPFILE} ${TZFILES}) # # Sort TZS to ensure they are the same every build. find -s might @@ -110,7 +110,7 @@ TZS!= cd ${TZBUILDDIR} && find * -type f | LC_ALL=C sort beforeinstall: install-zoneinfo install-zoneinfo: mkdir -p ${DESTDIR}/usr/share/zoneinfo - cd ${DESTDIR}/usr/share/zoneinfo; mkdir -p ${TZBUILDSUBDIRS} + (cd ${DESTDIR}/usr/share/zoneinfo; mkdir -p ${TZBUILDSUBDIRS}) .for f in ${TZS} ${INSTALL} ${TAG_ARGS} \ -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \