From owner-svn-ports-head@freebsd.org Tue Feb 23 17:54:48 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3C58954C230; Tue, 23 Feb 2021 17:54:48 +0000 (UTC) (envelope-from osa@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DlRX81JVMz3st6; Tue, 23 Feb 2021 17:54:48 +0000 (UTC) (envelope-from osa@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1F3F41D9FF; Tue, 23 Feb 2021 17:54:48 +0000 (UTC) (envelope-from osa@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 11NHslRc097077; Tue, 23 Feb 2021 17:54:47 GMT (envelope-from osa@FreeBSD.org) Received: (from osa@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 11NHslZ5097074; Tue, 23 Feb 2021 17:54:47 GMT (envelope-from osa@FreeBSD.org) Message-Id: <202102231754.11NHslZ5097074@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: osa set sender to osa@FreeBSD.org using -f From: "Sergey A. Osokin" Date: Tue, 23 Feb 2021 17:54:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r566418 - in head/databases: redis-devel/files redis/files redis5/files X-SVN-Group: ports-head X-SVN-Commit-Author: osa X-SVN-Commit-Paths: in head/databases: redis-devel/files redis/files redis5/files X-SVN-Commit-Revision: 566418 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Feb 2021 17:54:48 -0000 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 + #include + #include + #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 + #include + #include + #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 + #include + #include + #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. */