Date: Sat, 24 May 2014 08:51:33 +0200 (CEST) From: Melvyn Sopacua <melvyn@magemana.nl> To: FreeBSD-gnats-submit@freebsd.org Cc: osa@FreeBSD.org Subject: ports/190163: [PATCH] databases/redis: Fix luajit extra patch Message-ID: <20140524065133.CD9374AB526@fire.magemana.nl> Resent-Message-ID: <201405240700.s4O700C3092039@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 190163 >Category: ports >Synopsis: [PATCH] databases/redis: Fix luajit extra patch >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sat May 24 07:00:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Melvyn Sopacua >Release: FreeBSD 9.2-RELEASE-p6 amd64 >Organization: >Environment: System: FreeBSD fire.magemana.nl 9.2-RELEASE-p6 FreeBSD 9.2-RELEASE-p6 #2 r266258: Sat May 17 00:26:49 CEST 2014 melvyn@fire.magemana.nl:/usr/obj/usr/src/sys/TRANSIP amd64 >Description: When LUAJIT option is set, patch fails. This is cause upstream added the hyperloglog object. >How-To-Repeat: Enable LUAJIT option and build databases/redis >Fix: --- redis-luajit.patch begins here --- diff -r 99186f37ebce -r 1e3dc8a25f4f databases/redis/files/extra-patch-src-Makefile.luajit --- a/databases/redis/files/extra-patch-src-Makefile.luajit Sat May 24 08:35:08 2014 +0200 +++ b/databases/redis/files/extra-patch-src-Makefile.luajit Sat May 24 08:46:30 2014 +0200 @@ -31,7 +31,7 @@ @@ -105,6 +108,7 @@ REDIS_SERVER_NAME=redis-server REDIS_SENTINEL_NAME=redis-sentinel - REDIS_SERVER_OBJ=adlist.o ae.o anet.o dict.o redis.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 migrate.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 + REDIS_SERVER_OBJ=adlist.o ae.o anet.o dict.o redis.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 migrate.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 hyperloglog.o +REDIS_SERVER_OBJ+= lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o REDIS_CLI_NAME=redis-cli REDIS_CLI_OBJ=anet.o sds.o adlist.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o --- redis-luajit.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140524065133.CD9374AB526>