From nobody Fri Mar 17 05:48:38 2023 X-Original-To: dev-commits-src-branches@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 4PdCqB46mxz407dp; Fri, 17 Mar 2023 05:48:38 +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 4PdCqB3LrWz40yj; Fri, 17 Mar 2023 05:48:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679032118; 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=6fX7RnIJZoH73BlL4qLW0xtEcWmhxpg6vcHT3uFg/N8=; b=D6TM08qVjT01JyrrYNQsUFDGJKxMtuKWuGnJ3HGp93hPs7jz6WuQZ9R2OrwM8KE+T2V3nd 34bbk2N8U2fpSM56JN3Xv6vkJY0+JR8duM4Y2w/ne84AOUPN7upHKjWjZ4s69A/OoVX9tB U2A+QAthehJEZySk80uuF2X2F+SanpHUA5eHZwbWGySFzmEDImQYKqiSz3heAIlnXtzzN0 BqsA5DQi/Xa+w7t8ov7fhJhlDnIDU0dFqJt1dzhBX4yHw7yPE0j3i3uQBhTe4G2QeSpzpk ou4Ocv7U33Y12Q5NTMBgLpnD92OvGnWD0gCcfOErdoUaBHNasQ35lNHDyrRCcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679032118; 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=6fX7RnIJZoH73BlL4qLW0xtEcWmhxpg6vcHT3uFg/N8=; b=mrNoUocvv2xqCoC2kpRuJRKTPFFh0ZpjQ5Ej7pO+bz510OT8Q+l0feVtiBQ0G3vkLU7cQh Aj34etnLVvH68z2eUknWbah+pQgk2s0HakUg9bN3MtwsqFST4oLdfCXCltyR2mcI3KdEpX tPxNRM5IDyxHwUEGowbOniD7WcDKbx6fivwd/dd9MScdb4WC31yf5Zj1K62BKQmv/6sl6Z ta+zHux8cfvMPqeXdwMLuzC8UWVDDL0SUSoOb3gkLevZCAffYJSsvvqWidD7i4wCm3qjuL rETd8SiQFX3Ie94LW8yOq5Q+DobszNe3gbrzOdO/NJdtZ0n7aEV2p4avSU1SiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679032118; a=rsa-sha256; cv=none; b=VV7uQ1sEix1wfnkMPTZlKY7SxTXH6q18mmfE1e/p6igop6fhEAItqN6HN8SBo+3TkqWRx/ dd/q6uLMbusmWFCvF0b7f43OMWzWXOI+L6FJj7oWc5TnrzUizOGGY2PREiwsg+hWNqBe10 5zuwO4HxjLpNC/dQejiVmjxm85N2Nhi3zZB/ocCc54MABs91SgLb9E+9ZV3xAbpEeCYDsq E36kG2S5TIKNEp+GrAtijvMlEfgKIzF7L4gE7kt0OIrsrjEwP2srR56WF8VrtJaeC3ofd5 Lh1U8v+BePbi3R8dZXRGLjypbhqoKCGBbZ3EZdzfCC/u8MhGPOLdVWssSC2V1Q== 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 4PdCqB2P6jzDvW; Fri, 17 Mar 2023 05:48:38 +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 32H5mcov006312; Fri, 17 Mar 2023 05:48:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32H5mcDp006311; Fri, 17 Mar 2023 05:48:38 GMT (envelope-from git) Date: Fri, 17 Mar 2023 05:48:38 GMT Message-Id: <202303170548.32H5mcDp006311@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 04accaacd45a - stable/13 - i18n: csmapper: hook up the top-level .src files to the build List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 04accaacd45a4594aceb3589d05ca6da59acb4dd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=04accaacd45a4594aceb3589d05ca6da59acb4dd commit 04accaacd45a4594aceb3589d05ca6da59acb4dd Author: Kyle Evans AuthorDate: 2023-03-01 04:24:54 +0000 Commit: Kyle Evans CommitDate: 2023-03-17 05:01:45 +0000 i18n: csmapper: hook up the top-level .src files to the build The top-level charset.pivot.src may be empty, but the top-level mapper.dir.src is not -- it contains some definitions for supplementary UCS planes. The SMP/SSP definitions aren't actually used at the moment, but the inclusion of the SIP definitions fixes conversions involving JISX0213-1/JISX0213-2 to be possible. Sponsored by: Klara, Inc. (cherry picked from commit dc6df546be29a468ae21b1b7604e85b703ad6779) --- share/i18n/csmapper/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/i18n/csmapper/Makefile b/share/i18n/csmapper/Makefile index 7c6aca31c019..22c6d9014930 100644 --- a/share/i18n/csmapper/Makefile +++ b/share/i18n/csmapper/Makefile @@ -10,7 +10,7 @@ SUBDIR_PARALLEL= mapper.dir: ${SUBDIR} newfile=$$(for i in ${SUBDIR}; do \ cat $$i/mapper.dir.$$i; \ - done); \ + done; cat ${.CURDIR}/mapper.dir.src); \ [ "$$newfile" = "$$(cat ${.TARGET} 2>/dev/null)" ] || \ printf '%s\n' "$$newfile" >${.TARGET} mapper.dir.db: mapper.dir @@ -22,7 +22,7 @@ CLEANFILES+= mapper.dir mapper.dir.db charset.pivot: ${SUBDIR} newfile=$$(for i in ${SUBDIR}; do \ cat $$i/charset.pivot.$$i; \ - done); \ + done; cat ${.CURDIR}/charset.pivot.src); \ [ "$$newfile" = "$$(cat ${.TARGET} 2>/dev/null)" ] || \ printf '%s\n' "$$newfile" >${.TARGET} charset.pivot.pvdb: charset.pivot