On Tue, Apr 24 2018, Klemens Nanni <k...@openbsd.org> wrote: > New diff after the armv7 fix and input from jca. Works fine, all tests > pass on amd64. > > OK?
ok jca@ You could also get rid of the +INSTALL_SBIN=$(PREFIX)/sbin line in src/Makefile. > Index: Makefile > =================================================================== > RCS file: /cvs/ports/databases/redis/Makefile,v > retrieving revision 1.101 > diff -u -p -r1.101 Makefile > --- Makefile 19 Mar 2018 18:15:57 -0000 1.101 > +++ Makefile 24 Apr 2018 11:23:23 -0000 > @@ -17,12 +17,18 @@ MASTER_SITES = http://download.redis.io > MODULES = lang/lua \ > lang/tcl > > -MAKE_FLAGS = CC=${CC} \ > +MAKE_FLAGS = CC="${CC}" \ > + DEBUG="${DEBUG}" \ > + DEBUG_FLAGS="${DEBUG}" \ > + USE_JEMALLOC=no \ > + OPT="" \ > + OPTIMIZATION="" \ > V=1 > > FAKE_FLAGS = INSTALL="${INSTALL_PROGRAM}" \ > INSTALL_DIR="${INSTALL_DATA_DIR}" \ > - INSTALL_TOP="${WRKINST}${PREFIX}" > + INSTALL_TOP="${WRKINST}${PREFIX}" \ > + INSTALL_SBIN="${WRKINST}${PREFIX}/sbin" > > USE_GMAKE = Yes > > Index: patches/patch-deps_hiredis_Makefile > =================================================================== > RCS file: /cvs/ports/databases/redis/patches/patch-deps_hiredis_Makefile,v > retrieving revision 1.7 > diff -u -p -r1.7 patch-deps_hiredis_Makefile > --- patches/patch-deps_hiredis_Makefile 9 Aug 2017 09:16:09 -0000 > 1.7 > +++ patches/patch-deps_hiredis_Makefile 24 Apr 2018 11:23:23 -0000 > @@ -2,30 +2,7 @@ $OpenBSD: patch-deps_hiredis_Makefile,v > Index: deps/hiredis/Makefile > --- deps/hiredis/Makefile.orig > +++ deps/hiredis/Makefile > -@@ -38,9 +38,9 @@ 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++') > --OPTIMIZATION?=-O3 > -+# OPTIMIZATION?=-O3 > - WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings > --DEBUG_FLAGS?= -g -ggdb > -+# DEBUG_FLAGS?= -g -ggdb > - REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) > $(ARCH) > - REAL_LDFLAGS=$(LDFLAGS) $(ARCH) > - > -@@ -167,6 +167,10 @@ endif > - > - INSTALL?= cp -a > - > -+ifndef INSTALL_DIR > -+ INSTALL_DIR= mkdir -p > -+endif > -+ > - $(PKGCONFNAME): hiredis.h > - @echo "Generating $@ for pkgconfig..." > - @echo prefix=$(PREFIX) > $@ > -@@ -181,7 +185,7 @@ $(PKGCONFNAME): hiredis.h > +@@ -181,7 +181,7 @@ $(PKGCONFNAME): hiredis.h > @echo Cflags: -I\$${includedir} -D_FILE_OFFSET_BITS=64 >> $@ > > install: $(DYLIBNAME) $(STLIBNAME) $(PKGCONFNAME) > Index: patches/patch-deps_linenoise_Makefile > =================================================================== > RCS file: patches/patch-deps_linenoise_Makefile > diff -N patches/patch-deps_linenoise_Makefile > --- patches/patch-deps_linenoise_Makefile 3 Dec 2013 06:50:17 -0000 > 1.6 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,16 +0,0 @@ > -$OpenBSD: patch-deps_linenoise_Makefile,v 1.6 2013/12/03 06:50:17 dcoppa Exp > $ > ---- deps/linenoise/Makefile.orig Mon Dec 2 16:07:46 2013 > -+++ deps/linenoise/Makefile Tue Dec 3 07:52:03 2013 > -@@ -1,10 +1,10 @@ > - STD= > - WARN= -Wall > --OPT= -Os > -+# OPT= -Os > - > - R_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) > - R_LDFLAGS= $(LDFLAGS) > --DEBUG= -g > -+# DEBUG= -g > - > - R_CC=$(CC) $(R_CFLAGS) > - R_LD=$(CC) $(R_LDFLAGS) > Index: patches/patch-src_Makefile > =================================================================== > RCS file: /cvs/ports/databases/redis/patches/patch-src_Makefile,v > retrieving revision 1.28 > diff -u -p -r1.28 patch-src_Makefile > --- patches/patch-src_Makefile 22 Apr 2018 14:30:29 -0000 1.28 > +++ patches/patch-src_Makefile 24 Apr 2018 11:23:23 -0000 > @@ -2,13 +2,11 @@ $OpenBSD: patch-src_Makefile,v 1.28 2018 > Index: src/Makefile > --- src/Makefile.orig > +++ src/Makefile > -@@ -15,8 +15,8 @@ > - release_hdr := $(shell sh -c './mkreleasehdr.sh') > +@@ -16,7 +16,7 @@ release_hdr := $(shell sh -c './mkreleasehdr.sh') > uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') > uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not') > --OPTIMIZATION?=-O2 > + OPTIMIZATION?=-O2 > -DEPENDENCY_TARGETS=hiredis linenoise lua > -+# OPTIMIZATION?=-O2 > +DEPENDENCY_TARGETS=hiredis linenoise > NODEPS:=clean distclean > > @@ -30,15 +28,6 @@ Index: src/Makefile > endif > > # Backwards compatibility for selecting an allocator > -@@ -66,7 +67,7 @@ endif > - FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) > - FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) > - FINAL_LIBS=-lm > --DEBUG=-g -ggdb > -+# DEBUG=-g -ggdb > - > - ifeq ($(uname_S),SunOS) > - # SunOS > @@ -107,7 +108,7 @@ endif > endif > endif > @@ -48,27 +37,15 @@ Index: src/Makefile > > ifeq ($(MALLOC),tcmalloc) > FINAL_CFLAGS+= -DUSE_TCMALLOC > -@@ -129,6 +130,10 @@ REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) > - REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS) > - REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL) > - > -+ifndef INSTALL_DIR > -+ INSTALL_DIR= mkdir -p > -+endif > -+ > - CCCOLOR="\033[34m" > - LINKCOLOR="\033[34;1m" > - SRCCOLOR="\033[33m" > -@@ -144,7 +149,7 @@ endif > - > +@@ -145,6 +146,7 @@ endif > REDIS_SERVER_NAME=redis-server > REDIS_SENTINEL_NAME=redis-sentinel > --REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o > zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o > networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o > t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o > intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o > rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o > blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o > redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o > geohash_helper.o childinfo.o defrag.o siphash.o rax.o > -+REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o > zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o > networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o > t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o > intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o > rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o > blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o > redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o > geohash_helper.o childinfo.o defrag.o siphash.o rax.o fpconv.o strbuf.o > lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o > + REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o > zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o > networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o > t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o > intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o > rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o > blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o > redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o > geohash_helper.o childinfo.o defrag.o siphash.o rax.o > ++REDIS_SERVER_OBJ+=fpconv.o strbuf.o lua_bit.o lua_cjson.o lua_cmsgpack.o > lua_struct.o > REDIS_CLI_NAME=redis-cli > REDIS_CLI_OBJ=anet.o adlist.o redis-cli.o zmalloc.o release.o anet.o ae.o > crc64.o > REDIS_BENCHMARK_NAME=redis-benchmark > -@@ -196,7 +201,7 @@ endif > +@@ -196,7 +198,7 @@ endif > > # redis-server > $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ) > @@ -77,7 +54,7 @@ Index: src/Makefile > > # redis-sentinel > $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME) > -@@ -239,7 +244,7 @@ distclean: clean > +@@ -239,7 +241,7 @@ distclean: clean > .PHONY: distclean > > test: $(REDIS_SERVER_NAME) $(REDIS_CHECK_AOF_NAME) > @@ -86,15 +63,15 @@ Index: src/Makefile > > test-sentinel: $(REDIS_SENTINEL_NAME) > @(cd ..; ./runtest-sentinel) > -@@ -283,10 +288,11 @@ src/help.h: > +@@ -283,10 +285,11 @@ src/help.h: > @../utils/generate-command-help.rb > help.h > > install: all > - @mkdir -p $(INSTALL_BIN) > - $(REDIS_INSTALL) $(REDIS_SERVER_NAME) $(INSTALL_BIN) > -+ $(INSTALL_DIR) $(INSTALL_BIN) > + $(INSTALL_DIR) $(INSTALL_SBIN) > + $(REDIS_INSTALL) $(REDIS_SERVER_NAME) $(INSTALL_SBIN) > ++ $(INSTALL_DIR) $(INSTALL_BIN) > $(REDIS_INSTALL) $(REDIS_BENCHMARK_NAME) $(INSTALL_BIN) > $(REDIS_INSTALL) $(REDIS_CLI_NAME) $(INSTALL_BIN) > $(REDIS_INSTALL) $(REDIS_CHECK_RDB_NAME) $(INSTALL_BIN) > Index: patches/patch-src_mkreleasehdr_sh > =================================================================== > RCS file: patches/patch-src_mkreleasehdr_sh > diff -N patches/patch-src_mkreleasehdr_sh > --- patches/patch-src_mkreleasehdr_sh 29 Nov 2013 08:32:24 -0000 1.3 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,12 +0,0 @@ > -$OpenBSD: patch-src_mkreleasehdr_sh,v 1.3 2013/11/29 08:32:24 dcoppa Exp $ > ---- src/mkreleasehdr.sh.orig Wed Nov 27 15:20:37 2013 > -+++ src/mkreleasehdr.sh Wed Nov 27 15:21:03 2013 > -@@ -1,6 +1,6 @@ > - #!/bin/sh > --GIT_SHA1=`(git show-ref --head --hash=8 2> /dev/null || echo 00000000) | > head -n1` > --GIT_DIRTY=`git diff --no-ext-diff 2> /dev/null | wc -l` > -+GIT_SHA1=00000000 > -+GIT_DIRTY=0 > - BUILD_ID=`uname -n`"-"`date +%s` > - test -f release.h || touch release.h > - (cat release.h | grep SHA1 | grep $GIT_SHA1) && \ > =================================================================== > Stats: --- 84 lines 3716 chars > Stats: +++ 18 lines 1220 chars > Stats: -66 lines > Stats: -2496 chars > -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
