svn commit: r566418 - in head/databases: redis-devel/files redis/files redis5/files

[Sergey A. Osokin]

Author: osa
Date: Tue Feb 23 17:54:47 2021
New Revision: 566418
URL: https://svnweb.freebsd.org/changeset/ports/566418

Log:
  Fix build.
  
  cc -std=c11 -pedantic -DREDIS_STATIC='' -Wall -W -Wno-missing-field-initializers   -O2 -pipe  -fstack-protector-strong -fno-strict-aliasing   -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src -MMD -o lzf_c.o -c lzf_c.c
  zmalloc.c:59:5: error: function-like macro 'sizeof' is not defined
  #if PREFIX_SIZE > 0
      ^
  zmalloc.c:55:22: note: expanded from macro 'PREFIX_SIZE'
  #define PREFIX_SIZE (sizeof(size_t))
                       ^
  1 error generated.
  gmake[3]: *** [Makefile:339: zmalloc.o] Error 1
  
  Do not bump PORTREVISION because these have no successful
  builds.
  
  Reported by:	many

Added:
  head/databases/redis-devel/files/patch-src-zmalloc.c   (contents, props changed)
  head/databases/redis/files/patch-src-zmalloc.c   (contents, props changed)
  head/databases/redis5/files/patch-src-zmalloc.c   (contents, props changed)

Added: head/databases/redis-devel/files/patch-src-zmalloc.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/redis-devel/files/patch-src-zmalloc.c	Tue Feb 23 17:54:47 2021	(r566418)
@@ -0,0 +1,30 @@
+--- src/zmalloc.c.orig	2021-02-23 11:09:32.095861000 -0500
++++ src/zmalloc.c	2021-02-23 11:20:04.491174000 -0500
+@@ -40,6 +40,7 @@
+     free(ptr);
+ }
+ 
++#include <assert.h>
+ #include <string.h>
+ #include <pthread.h>
+ #include "config.h"
+@@ -48,18 +49,14 @@
+ 
+ #ifdef HAVE_MALLOC_SIZE
+ #define PREFIX_SIZE (0)
++#define ASSERT_NO_SIZE_OVERFLOW(sz)
+ #else
+ #if defined(__sun) || defined(__sparc) || defined(__sparc__)
+ #define PREFIX_SIZE (sizeof(long long))
+ #else
+ #define PREFIX_SIZE (sizeof(size_t))
+ #endif
+-#endif
+-
+-#if PREFIX_SIZE > 0
+ #define ASSERT_NO_SIZE_OVERFLOW(sz) assert((sz) + PREFIX_SIZE > (sz))
+-#else
+-#define ASSERT_NO_SIZE_OVERFLOW(sz)
+ #endif
+ 
+ /* Explicitly override malloc/free etc when using tcmalloc. */

Added: head/databases/redis/files/patch-src-zmalloc.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/redis/files/patch-src-zmalloc.c	Tue Feb 23 17:54:47 2021	(r566418)
@@ -0,0 +1,30 @@
+--- src/zmalloc.c.orig	2021-02-23 11:09:32.095861000 -0500
++++ src/zmalloc.c	2021-02-23 11:20:04.491174000 -0500
+@@ -40,6 +40,7 @@
+     free(ptr);
+ }
+ 
++#include <assert.h>
+ #include <string.h>
+ #include <pthread.h>
+ #include "config.h"
+@@ -48,18 +49,14 @@
+ 
+ #ifdef HAVE_MALLOC_SIZE
+ #define PREFIX_SIZE (0)
++#define ASSERT_NO_SIZE_OVERFLOW(sz)
+ #else
+ #if defined(__sun) || defined(__sparc) || defined(__sparc__)
+ #define PREFIX_SIZE (sizeof(long long))
+ #else
+ #define PREFIX_SIZE (sizeof(size_t))
+ #endif
+-#endif
+-
+-#if PREFIX_SIZE > 0
+ #define ASSERT_NO_SIZE_OVERFLOW(sz) assert((sz) + PREFIX_SIZE > (sz))
+-#else
+-#define ASSERT_NO_SIZE_OVERFLOW(sz)
+ #endif
+ 
+ /* Explicitly override malloc/free etc when using tcmalloc. */

Added: head/databases/redis5/files/patch-src-zmalloc.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/redis5/files/patch-src-zmalloc.c	Tue Feb 23 17:54:47 2021	(r566418)
@@ -0,0 +1,30 @@
+--- src/zmalloc.c.orig	2021-02-23 11:09:32.095861000 -0500
++++ src/zmalloc.c	2021-02-23 11:20:04.491174000 -0500
+@@ -40,6 +40,7 @@
+     free(ptr);
+ }
+ 
++#include <assert.h>
+ #include <string.h>
+ #include <pthread.h>
+ #include "config.h"
+@@ -48,18 +49,14 @@
+ 
+ #ifdef HAVE_MALLOC_SIZE
+ #define PREFIX_SIZE (0)
++#define ASSERT_NO_SIZE_OVERFLOW(sz)
+ #else
+ #if defined(__sun) || defined(__sparc) || defined(__sparc__)
+ #define PREFIX_SIZE (sizeof(long long))
+ #else
+ #define PREFIX_SIZE (sizeof(size_t))
+ #endif
+-#endif
+-
+-#if PREFIX_SIZE > 0
+ #define ASSERT_NO_SIZE_OVERFLOW(sz) assert((sz) + PREFIX_SIZE > (sz))
+-#else
+-#define ASSERT_NO_SIZE_OVERFLOW(sz)
+ #endif
+ 
+ /* Explicitly override malloc/free etc when using tcmalloc. */