Date: Sat, 30 Nov 2019 00:12:30 +0000 (UTC) From: "Sergey A. Osokin" <osa@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r518681 - in head/databases/redis-devel: . files Message-ID: <201911300012.xAU0CUCO047770@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: osa Date: Sat Nov 30 00:12:29 2019 New Revision: 518681 URL: https://svnweb.freebsd.org/changeset/ports/518681 Log: Update to the recent commit. Make portlint(1) more happier by regenerating the patch and move USES knob up. Add another patch to respect [C|CXX]FLAGS. Added: head/databases/redis-devel/files/patch-deps_Makefile (contents, props changed) Modified: head/databases/redis-devel/Makefile head/databases/redis-devel/distinfo head/databases/redis-devel/files/patch-deps-hiredis-Makefile head/databases/redis-devel/files/patch-src-Makefile Modified: head/databases/redis-devel/Makefile ============================================================================== --- head/databases/redis-devel/Makefile Fri Nov 29 23:26:04 2019 (r518680) +++ head/databases/redis-devel/Makefile Sat Nov 30 00:12:29 2019 (r518681) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= redis -PORTVERSION= 6.0.0.20191125 +PORTVERSION= 6.0.0.20191129 CATEGORIES= databases PKGNAMESUFFIX= -devel @@ -11,10 +11,9 @@ COMMENT= Persistent key-value database with built-in n LICENSE= BSD3CLAUSE +USES+= compiler gmake USE_GITHUB= yes -GH_ACCOUNT= antirez -GH_PROJECT= ${PORTNAME} -GH_TAGNAME= a1b6548 +GH_TUPLE= antirez:${PORTNAME}:f5d4853 OPTIONS_DEFINE= JEMALLOC TESTS TRIB OPTIONS_RADIO= EXTLUA @@ -26,7 +25,6 @@ LUAJIT_DESC= Use lang/luajit instead of builtin lua TESTS_DESC= Install lang/tcl for redis unit tests TRIB_DESC= Install redis-trib.rb (lang/ruby req.) -USES+= compiler gmake MAKE_ENV= "V=yo" .include <bsd.port.options.mk> Modified: head/databases/redis-devel/distinfo ============================================================================== --- head/databases/redis-devel/distinfo Fri Nov 29 23:26:04 2019 (r518680) +++ head/databases/redis-devel/distinfo Sat Nov 30 00:12:29 2019 (r518681) @@ -1,3 +1,3 @@ -TIMESTAMP = 1574869655 -SHA256 (antirez-redis-6.0.0.20191125-a1b6548_GH0.tar.gz) = 33f9e9af6339d7d6aaa583ba8fefc42986a3577cacc63db3750175f88a484f58 -SIZE (antirez-redis-6.0.0.20191125-a1b6548_GH0.tar.gz) = 2164648 +TIMESTAMP = 1575048154 +SHA256 (antirez-redis-6.0.0.20191129-f5d4853_GH0.tar.gz) = ad80a318994bd763362825d73b5b2c674dbbee66a7caa25bbe33608025bcf0dd +SIZE (antirez-redis-6.0.0.20191129-f5d4853_GH0.tar.gz) = 2164641 Modified: head/databases/redis-devel/files/patch-deps-hiredis-Makefile ============================================================================== --- head/databases/redis-devel/files/patch-deps-hiredis-Makefile Fri Nov 29 23:26:04 2019 (r518680) +++ head/databases/redis-devel/files/patch-deps-hiredis-Makefile Sat Nov 30 00:12:29 2019 (r518681) @@ -1,6 +1,6 @@ ---- deps/hiredis/Makefile.orig 2019-11-24 18:44:27.552196000 -0500 -+++ deps/hiredis/Makefile 2019-11-24 19:16:28.147610000 -0500 -@@ -21,7 +21,7 @@ +--- deps/hiredis/Makefile.orig 2019-11-29 16:35:59 UTC ++++ deps/hiredis/Makefile +@@ -21,7 +21,7 @@ HIREDIS_PATCH=$(shell grep HIREDIS_PATCH hiredis.h | a HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h | awk '{print $$3}') # Installation related variables and target @@ -9,7 +9,7 @@ INCLUDE_PATH?=include/hiredis LIBRARY_PATH?=lib PKGCONF_PATH?=pkgconfig -@@ -44,10 +44,8 @@ +@@ -44,10 +44,8 @@ export REDIS_TEST_CONFIG # Fallback to gcc when $CC is not in $PATH. CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc') CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++') @@ -21,7 +21,7 @@ REAL_LDFLAGS=$(LDFLAGS) DYLIBSUFFIX=so -@@ -82,6 +80,16 @@ +@@ -82,6 +80,16 @@ endif ifeq ($(uname_S),SunOS) REAL_LDFLAGS+= -ldl -lnsl -lsocket DYLIB_MAKE_CMD=$(CC) -G -o $(DYLIBNAME) -h $(DYLIB_MINOR_NAME) $(LDFLAGS) Added: head/databases/redis-devel/files/patch-deps_Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/redis-devel/files/patch-deps_Makefile Sat Nov 30 00:12:29 2019 (r518681) @@ -0,0 +1,18 @@ +--- deps/Makefile.orig 2019-11-29 16:35:59 UTC ++++ deps/Makefile +@@ -76,12 +76,12 @@ lua: .make-prerequisites + + .PHONY: lua + +-JEMALLOC_CFLAGS= -std=gnu99 -Wall -pipe -g3 -O3 -funroll-loops $(CFLAGS) ++JEMALLOC_CFLAGS= -std=gnu99 -Wall -pipe -funroll-loops $(CFLAGS) + JEMALLOC_LDFLAGS= $(LDFLAGS) + + jemalloc: .make-prerequisites + @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR) +- cd jemalloc && ./configure --with-version=5.1.0-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ --enable-cc-silence CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" +- cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a ++ cd jemalloc && ./configure --with-version=5.1.0-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ --enable-cc-silence CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" ++ cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a + + .PHONY: jemalloc Modified: head/databases/redis-devel/files/patch-src-Makefile ============================================================================== --- head/databases/redis-devel/files/patch-src-Makefile Fri Nov 29 23:26:04 2019 (r518680) +++ head/databases/redis-devel/files/patch-src-Makefile Sat Nov 30 00:12:29 2019 (r518681) @@ -1,4 +1,4 @@ ---- src/Makefile.orig 2019-09-25 10:40:18 UTC +--- src/Makefile.orig 2019-11-29 16:35:59 UTC +++ src/Makefile @@ -29,7 +29,7 @@ endif WARN=-Wall -W -Wno-missing-field-initializers @@ -15,11 +15,11 @@ FINAL_LIBS=-lm -DEBUG=-g -ggdb - ifeq ($(uname_S),SunOS) - # SunOS -@@ -94,6 +93,11 @@ ifeq ($(uname_S),Darwin) - # Darwin - FINAL_LIBS+= -ldl + # Linux ARM needs -latomic at linking time + ifneq (,$(filter aarch64 armv,$(uname_M))) +@@ -105,6 +104,11 @@ ifeq ($(uname_S),Darwin) + OPENSSL_CFLAGS=-I/usr/local/opt/openssl/include + OPENSSL_LDFLAGS=-L/usr/local/opt/openssl/lib else +ifeq ($(uname_S),FreeBSD) + # FreeBSD @@ -29,7 +29,7 @@ ifeq ($(uname_S),AIX) # AIX FINAL_LDFLAGS+= -Wl,-bexpall -@@ -120,6 +124,7 @@ else +@@ -131,6 +135,7 @@ else # All the other OSes (notably Linux) FINAL_LDFLAGS+= -rdynamic FINAL_LIBS+=-ldl -pthread -lrt
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201911300012.xAU0CUCO047770>