Friday, January 29, 2021

textproc/the_silver_searcher: -fno-common

Hi,

The following patch backport upstream patch to compile with
-fno-common :

https://github.com/ggreer/the_silver_searcher/commit/21eaa1c4160b868b0c5bbf59da17974429f30055

Upstream patch doesn't cleanly apply to src/search.c du to context
changes, but manually applying it work.

Tested with and without CFLAGS=-fno-common on amd64.

Comments or OK ?
--
Sebastien Marie

Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/the_silver_searcher/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- Makefile 12 Jul 2019 20:50:16 -0000 1.33
+++ Makefile 29 Jan 2021 15:48:06 -0000
@@ -4,7 +4,7 @@ COMMENT = code searching tool, with a fo

DISTNAME = the_silver_searcher-2.2.0
CATEGORIES = textproc
-REVISION = 0
+REVISION = 1

HOMEPAGE = https://geoff.greer.fm/ag/
# Apache 2.0
Index: patches/patch-src_ignore_c
===================================================================
RCS file: patches/patch-src_ignore_c
diff -N patches/patch-src_ignore_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_ignore_c 29 Jan 2021 15:48:06 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+Compile with -fno-common
+https://github.com/ggreer/the_silver_searcher/commit/21eaa1c4160b868b0c5bbf59da17974429f30055
+
+Index: src/ignore.c
+--- src/ignore.c.orig
++++ src/ignore.c
+@@ -20,6 +20,8 @@
+ const int fnmatch_flags = FNM_PATHNAME;
+

No comments:

Post a Comment