summaryrefslogtreecommitdiff
path: root/databases/libmemcached
diff options
context:
space:
mode:
authorNiclas Zeising <zeising@FreeBSD.org>2020-08-22 10:23:59 +0000
committerNiclas Zeising <zeising@FreeBSD.org>2020-08-22 10:23:59 +0000
commit3f52214dc43125e311f54e4b4593d241c52ce2b6 (patch)
tree4c7df76c08191a8f1f53a9ccdbc0381efdd96119 /databases/libmemcached
parentvuln.xml: add chrony < 3.5.1 pidfile symlink vulnerability (diff)
databases/libmemcached: Fix build with -fno-common
Fix the build of databaes/libmemcached with -fno-common, which is the default with llvm 11. MFH: 2020Q3 (implicit, -fno-common fixes, ok by joenum)
Notes
Notes: svn path=/head/; revision=545758
Diffstat (limited to 'databases/libmemcached')
-rw-r--r--databases/libmemcached/files/patch-clients_memaslap.c14
-rw-r--r--databases/libmemcached/files/patch-clients_ms__memslap.h23
2 files changed, 37 insertions, 0 deletions
diff --git a/databases/libmemcached/files/patch-clients_memaslap.c b/databases/libmemcached/files/patch-clients_memaslap.c
new file mode 100644
index 000000000000..02ea7c490ed7
--- /dev/null
+++ b/databases/libmemcached/files/patch-clients_memaslap.c
@@ -0,0 +1,14 @@
+--- clients/memaslap.c.orig 2020-08-22 10:06:16 UTC
++++ clients/memaslap.c
+@@ -45,6 +45,11 @@
+ #define OPTIONSTRING const char*
+ #endif
+
++/* global variables */
++ms_global_t ms_global;
++ms_statistic_t ms_statistic;
++ms_stats_t ms_stats;
++
+ /* options */
+ static struct option long_options[]=
+ {
diff --git a/databases/libmemcached/files/patch-clients_ms__memslap.h b/databases/libmemcached/files/patch-clients_ms__memslap.h
new file mode 100644
index 000000000000..7b992f71119b
--- /dev/null
+++ b/databases/libmemcached/files/patch-clients_ms__memslap.h
@@ -0,0 +1,23 @@
+--- clients/ms_memslap.h.orig 2020-08-22 10:06:28 UTC
++++ clients/ms_memslap.h
+@@ -116,14 +116,14 @@ typedef struct global
+ bool time_out;
+ } ms_global_t;
+
+-/* global structure */
+-ms_global_t ms_global;
++/* global structure, defined in memaslap.c */
++extern ms_global_t ms_global;
+
+-/* global stats information structure */
+-ms_stats_t ms_stats;
++/* global stats information structure, defined in memaslap.c */
++extern ms_stats_t ms_stats;
+
+-/* global statistic structure */
+-ms_statistic_t ms_statistic;
++/* global statistic structure, defined in mamaslap.c */
++extern ms_statistic_t ms_statistic;
+
+ #ifdef __cplusplus
+ }