Friday, January 29, 2021

-fno-common fix for textproc/the_silver_searcher

Build tested.

OK?


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:37:16 -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:37:16 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Fix -fno-common build failure. Taken from
+https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4174b1f2bba16be562beadb8926b26fce40a41d1
+
+Index: src/ignore.c
+--- src/ignore.c.orig
++++ src/ignore.c
+@@ -22,6 +22,8 @@ const int fnmatch_flags = FNM_PATHNAME;
+
+ /* TODO: build a huge-ass list of files we want to ignore by default (build cache stuff, pyc files, etc) */
+
++ignores *root_ignores;
++
+ const char *evil_hardcoded_ignore_files[] = {
+ ".",
+ "..",
Index: patches/patch-src_ignore_h
===================================================================
RCS file: patches/patch-src_ignore_h
diff -N patches/patch-src_ignore_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_ignore_h 29 Jan 2021 15:37:16 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Fix -fno-common build failure. Taken from
+https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4174b1f2bba16be562beadb8926b26fce40a41d1
+
+Index: src/ignore.h
+--- src/ignore.h.orig
++++ src/ignore.h
+@@ -29,7 +29,7 @@ struct ignores {
+ };
+ typedef struct ignores ignores;
+
+-ignores *root_ignores;
++extern ignores *root_ignores;
+
+ extern const char *evil_hardcoded_ignore_files[];
+ extern const char *ignore_pattern_files[];
Index: patches/patch-src_log_c
===================================================================
RCS file: patches/patch-src_log_c
diff -N patches/patch-src_log_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_log_c 29 Jan 2021 15:37:16 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Fix -fno-common build failure. Taken from
+https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4174b1f2bba16be562beadb8926b26fce40a41d1
+
+Index: src/log.c
+--- src/log.c.orig
++++ src/log.c
+@@ -4,6 +4,8 @@
+ #include "log.h"
+ #include "util.h"
+
++pthread_mutex_t print_mtx;
++
+ static enum log_level log_threshold = LOG_LEVEL_ERR;
+
+ void set_log_level(enum log_level threshold) {
Index: patches/patch-src_log_h
===================================================================
RCS file: patches/patch-src_log_h
diff -N patches/patch-src_log_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_log_h 29 Jan 2021 15:37:16 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Fix -fno-common build failure. Taken from
+https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4174b1f2bba16be562beadb8926b26fce40a41d1
+
+Index: src/log.h
+--- src/log.h.orig
++++ src/log.h
+@@ -9,7 +9,7 @@
+ #include <pthread.h>
+

No comments:

Post a Comment