From owner-dev-commits-ports-all@freebsd.org Tue Apr 20 16:24:26 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 17E265DE1EB; Tue, 20 Apr 2021 16:24:26 +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 4FPpt209bXz3CbJ; Tue, 20 Apr 2021 16:24:26 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 ECF2A15ED6; Tue, 20 Apr 2021 16:24:25 +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 13KGOPwq085159; Tue, 20 Apr 2021 16:24:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13KGOPEC085158; Tue, 20 Apr 2021 16:24:25 GMT (envelope-from git) Date: Tue, 20 Apr 2021 16:24:25 GMT Message-Id: <202104201624.13KGOPEC085158@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?B?RmVybmFuZG8gQXBlc3RlZ3XDrWE=?= Subject: git: 803383519aa6 - main - devel/universal-ctags: fix 32 bit platforms and unit test on 13 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 803383519aa63406409d2a88b88425e902bb93d8 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Apr 2021 16:24:26 -0000 The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=803383519aa63406409d2a88b88425e902bb93d8 commit 803383519aa63406409d2a88b88425e902bb93d8 Author: Fernando Apesteguía AuthorDate: 2021-04-20 07:32:07 +0000 Commit: Fernando Apesteguía CommitDate: 2021-04-20 16:20:54 +0000 devel/universal-ctags: fix 32 bit platforms and unit test on 13 * bit shifting when right side is >= size of left side results in unknown behavior on some 32-bit platforms. Reported upstream [1] and being fixed [2] Once fixed in arithy/packcc universal-ctags/ctags will need to import. * Fix regex in unit test due to possible bug with FreeBSD 13. PR: 255167 Reported by: dereks@lifeofadishwasher.com (maintainer) --- .../files/patch-Tmain_map-removing.d_run.sh | 32 ++++++++++++++++++++++ .../files/patch-misc_packcc_src_packcc.c | 11 ++++++++ 2 files changed, 43 insertions(+) diff --git a/devel/universal-ctags/files/patch-Tmain_map-removing.d_run.sh b/devel/universal-ctags/files/patch-Tmain_map-removing.d_run.sh new file mode 100644 index 000000000000..114bc757307f --- /dev/null +++ b/devel/universal-ctags/files/patch-Tmain_map-removing.d_run.sh @@ -0,0 +1,32 @@ +--- Tmain/map-removing.d/run.sh.orig 2021-04-18 04:45:23 UTC ++++ Tmain/map-removing.d/run.sh +@@ -6,25 +6,25 @@ CTAGS=$1 + echo default map including '*.m' + echo ======================================= + ${CTAGS} --quiet --options=NONE \ +- --list-maps | grep '\*\.m\>.*$' ++ --list-maps | grep '\*\.m\>' + echo + + echo '[--map-]' removing from '*.m' from 'ObjectiveC' + echo ======================================= + ${CTAGS} --quiet --options=NONE \ +- --map-ObjectiveC=-.m --list-maps | grep '\*\.m\>.*$' ++ --map-ObjectiveC=-.m --list-maps | grep '\*\.m\>' + echo + + echo '[--map-]' adding '*.m' to 'Ada' + echo ======================================= + ${CTAGS} --quiet --options=NONE \ +- --map-Ada=+.m --list-maps | grep '\*\.m\>.*$' ++ --map-Ada=+.m --list-maps | grep '\*\.m\>' + echo + + echo '[--map-]' removing from '*.m' from 'ObjectiveC', and adding '*.m' to 'Ada' + echo ======================================= + ${CTAGS} --quiet --options=NONE \ +- --map-ObjectiveC=-.m --map-Ada=+.m --list-maps | grep '\*\.m\>.*$' ++ --map-ObjectiveC=-.m --map-Ada=+.m --list-maps | grep '\*\.m\>' + echo + + echo '[--map-]' guessing parser with adding '*.m' to 'Ada' diff --git a/devel/universal-ctags/files/patch-misc_packcc_src_packcc.c b/devel/universal-ctags/files/patch-misc_packcc_src_packcc.c new file mode 100644 index 000000000000..5bc12de4c8f2 --- /dev/null +++ b/devel/universal-ctags/files/patch-misc_packcc_src_packcc.c @@ -0,0 +1,11 @@ +--- misc/packcc/src/packcc.c.orig 2021-04-16 22:31:22 UTC ++++ misc/packcc/src/packcc.c +@@ -910,7 +910,7 @@ static size_t populate_bits(size_t x) { + x |= x >> 4; + x |= x >> 8; + x |= x >> 16; +-#ifndef _M_IX86 /* not Windows for x86 (32-bit) */ ++#if (defined __SIZEOF_SIZE_T__ && __SIZEOF_SIZE_T__ == 8) + x |= x >> 32; + #endif + return x;