From nobody Wed Nov 15 00:53:35 2023 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 4SVPmb5Yj7z51JmM; Wed, 15 Nov 2023 00:53:35 +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 4SVPmb55pJz4JNj; Wed, 15 Nov 2023 00:53:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700009615; 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=YdMtX08CIYcM7B63/4TjmJwGfpyXLgV9GneOXlGgbH4=; b=qUeCqfnbBMIq1fSK2sa7bvPldKz6XwMU+ta80odY5OXBhEXiRUd8E7lFXxi1tdZYxOdg8T JMR23FCfSsyi+3ZrDzXqO+fhBZMdzjgmhiWdHInaACsBQVRO/9aQOMPu5X1o2maMLZoUOg 1A97oKisNavJx3JvisGzwtL1WJZiFvStLO3x2COB2dpV0sBhCg3pOkoSpyBWuJOh3ZlbAS LhJURwfWGJl0sQK+zNqDJjmjNThb55kWaFmvU1R+i/tfiNqc7+SON/fIEjYFJSCwyqys9n +MWxNfbONjDcexqPTXZKIVOYK3z4MGwNzLUWwkHmzEph39Eta8P+UdGl3TkeHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700009615; 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=YdMtX08CIYcM7B63/4TjmJwGfpyXLgV9GneOXlGgbH4=; b=UGBRCSRp9iG02Vyo5KwnsFkRrFaK+zOwtOyRnh9++3wQXSnWaBwxcLTkmHkVQeV5ElRL+B NaIK26grH4U8Sil6IRrbMohcKwS7wP+xq69mf+5ps8//yaZo6YF+Xw1UoRyEvK6JEY8skh sp8wF695tjKrJMow9c6rlKL01wUICTrr3h4bkecWv3uUrMINpzY1cVIdFE7HEYKE34d0t6 pHu5cBTXtP/4J6AgIVZ+Vq3eydAX9P1bkWUnU0FCK3zZqR44YgL/rFYxSlzIDetOdIEb0G KAFXAAdS2Y6B49dA9FBCAjOgzmQCCHVYulruBKp+lnIGP+y3MvxKxz8y6wvAKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700009615; a=rsa-sha256; cv=none; b=QkXkSmpO1A9hl8V5/oTzlPaK++dRdOo5DZ3TrA/nKQbh49c70mL75uv7gcOv58SMjLD61w 7M8ASi9PNUQ5igORQculJHFMkaM0/AgHc8Vf4yv2/lcbQvxL25r7AGnkjI3AYyMFuhIm4b DYGOKWdUCGfHOOIYO4aZl74uAiYCBsho2qKcqsnyA+QBMXkNUKtBcrXGceGe+ujWYB522q Ln9W2XvoSP5fyQpZJOMmoG3R/JYvR08XezjLgff41MVb1J3h/wnaOAW4UEDYWNXPZ0z833 q+RtJ9l35Qs/x+hp5NilEw/yn/Ql7CY6I28y5oiokbWlufgUVMajYPXNpf5KOQ== 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 4SVPmb48N3z19Rq; Wed, 15 Nov 2023 00:53:35 +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 3AF0rZF3041645; Wed, 15 Nov 2023 00:53:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AF0rZj9041642; Wed, 15 Nov 2023 00:53:35 GMT (envelope-from git) Date: Wed, 15 Nov 2023 00:53:35 GMT Message-Id: <202311150053.3AF0rZj9041642@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Stephen J. Kiernan" Subject: git: fa08011a521c - main - 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: stevek X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fa08011a521c1f15ca44d6a4f30a318d0a37a3a7 Auto-Submitted: auto-generated The branch main has been updated by stevek: URL: https://cgit.FreeBSD.org/src/commit/?id=fa08011a521c1f15ca44d6a4f30a318d0a37a3a7 commit fa08011a521c1f15ca44d6a4f30a318d0a37a3a7 Author: Stephen J. Kiernan AuthorDate: 2023-11-15 00:38:47 +0000 Commit: Stephen J. Kiernan CommitDate: 2023-11-15 00:51:40 +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 --- 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} \