From owner-freebsd-ports-bugs@FreeBSD.ORG Sat May 24 07:00:01 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F2A57D2B for ; Sat, 24 May 2014 07:00:00 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D411620F1 for ; Sat, 24 May 2014 07:00:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s4O700ac092049 for ; Sat, 24 May 2014 07:00:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s4O700C3092039; Sat, 24 May 2014 07:00:00 GMT (envelope-from gnats) Resent-Date: Sat, 24 May 2014 07:00:00 GMT Resent-Message-Id: <201405240700.s4O700C3092039@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Melvyn Sopacua Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E63E5BF0; Sat, 24 May 2014 06:51:35 +0000 (UTC) Received: from fire.magemana.nl (magemana.nl [IPv6:2a01:7c8:aaae:25e::1]) by mx1.freebsd.org (Postfix) with ESMTP id B207320BF; Sat, 24 May 2014 06:51:35 +0000 (UTC) Received: by fire.magemana.nl (Postfix, from userid 1003) id CD9374AB526; Sat, 24 May 2014 08:51:33 +0200 (CEST) Message-Id: <20140524065133.CD9374AB526@fire.magemana.nl> Date: Sat, 24 May 2014 08:51:33 +0200 (CEST) From: Melvyn Sopacua To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/190163: [PATCH] databases/redis: Fix luajit extra patch Cc: osa@FreeBSD.org X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 May 2014 07:00:01 -0000 >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: