Attachment 224206 Details for Bug 255167 – Fix unit test on 13 and 32-bit builds

[patch] Fix unit test on 13 and 32-bit builds

0001-devel-universal-ctags-fix-32-bit-platforms-and-unit-.patch (text/plain), 3.08 KB, created by Derek Schrock on 2021-04-18 06:06:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Derek Schrock

Created: 2021-04-18 06:06:32 UTC

Size: 3.08 KB

patch

obsolete

>From 694e17eb9c629ee91b653d84d884711cec7257e8 Mon Sep 17 00:00:00 2001
>From: Derek Schrock <dereks@lifeofadishwasher.com>
>Date: Fri, 16 Apr 2021 23:07:01 -0400
>Subject: [PATCH] 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.
>
>[1] https://github.com/arithy/packcc/issues/34
>[2] https://github.com/arithy/packcc/commit/6015afca6dd09376cc6011be429c6053dc688bbd
>---
> .../files/patch-Tmain_map-removing.d_run.sh   | 32 +++++++++++++++++++
> .../files/patch-misc_packcc_src_packcc.c      | 11 +++++++
> 2 files changed, 43 insertions(+)
> create mode 100644 devel/universal-ctags/files/patch-Tmain_map-removing.d_run.sh
> create mode 100644 devel/universal-ctags/files/patch-misc_packcc_src_packcc.c
>
>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 000000000..114bc7573
>--- /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-<LANG>]' 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-<LANG>]' 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-<LANG>]' 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-<LANG>]' 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 000000000..5bc12de4c
>--- /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;
>-- 
>2.31.1
>

Flags:

dereks: maintainer-approval+

Actions: View | Diff

Attachments on bug 255167: 224206