From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Dec 1 22:00:32 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B61B11065672 for ; Thu, 1 Dec 2011 22:00:32 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 92FF48FC20 for ; Thu, 1 Dec 2011 22:00:32 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id pB1M0WY0017437 for ; Thu, 1 Dec 2011 22:00:32 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id pB1M0Wpa017436; Thu, 1 Dec 2011 22:00:32 GMT (envelope-from gnats) Resent-Date: Thu, 1 Dec 2011 22:00:32 GMT Resent-Message-Id: <201112012200.pB1M0Wpa017436@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, Grzegorz Blach Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AB6AD106566C for ; Thu, 1 Dec 2011 21:55:02 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 76E598FC13 for ; Thu, 1 Dec 2011 21:55:02 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id pB1Lt2Ln037331 for ; Thu, 1 Dec 2011 21:55:02 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id pB1Lt2VI037330; Thu, 1 Dec 2011 21:55:02 GMT (envelope-from nobody) Message-Id: <201112012155.pB1Lt2VI037330@red.freebsd.org> Date: Thu, 1 Dec 2011 21:55:02 GMT From: Grzegorz Blach To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/163004: databases/redis: Fixed build on i386 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Dec 2011 22:00:32 -0000 >Number: 163004 >Category: ports >Synopsis: databases/redis: Fixed build on i386 >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Dec 01 22:00:31 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Grzegorz Blach >Release: 9.0-RC2 amd64 >Organization: >Environment: FreeBSD silver.nine 9.0-RC2 FreeBSD 9.0-RC2 #2: Wed Nov 9 21:17:39 CET 2011 root@silver.nine:/usr/obj/usr/src/sys/SILVER amd64 >Description: Patch extra-patch-src::redis.c fixes building on amd64 platform, but unfortunately broke building on i386, so this patch should be applied conditionally, only on amd64. >How-To-Repeat: Try build databases/redis-2.4.4_1 on i386 platform >Fix: Patch attached with submission follows: diff -ruN databases/redis/Makefile databases/redis/Makefile --- databases/redis/Makefile 2011-11-30 13:46:19.000000000 +0100 +++ databases/redis/Makefile 2011-12-01 20:56:38.166112312 +0100 @@ -7,7 +7,7 @@ PORTNAME= redis PORTVERSION= 2.4.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= GOOGLE_CODE @@ -48,6 +48,13 @@ REDIS_DBDIR=${REDIS_DBDIR} \ REDIS_RUNDIR=${REDIS_RUNDIR} +.include + +post-patch: +.if ${ARCH} == amd64 + @${PATCH} -d ${WRKSRC} < files/extra-patch-src::redis.c +.endif + post-build: ${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ ${WRKSRC}/redis.conf > ${WRKDIR}/redis.conf @@ -61,4 +68,4 @@ [ -d ${d} ] || ${MKDIR} ${d} && ${CHOWN} ${USERS}:${GROUPS} ${d} .endfor -.include +.include diff -ruN databases/redis/files/extra-patch-src::redis.c databases/redis/files/extra-patch-src::redis.c --- databases/redis/files/extra-patch-src::redis.c 1970-01-01 01:00:00.000000000 +0100 +++ databases/redis/files/extra-patch-src::redis.c 2011-12-01 20:43:08.132116792 +0100 @@ -0,0 +1,11 @@ +--- src/redis.c.orig 2011-11-30 16:29:38.000000000 +0400 ++++ src/redis.c 2011-11-30 16:29:59.000000000 +0400 +@@ -1685,7 +1685,7 @@ + #ifdef HAVE_BACKTRACE + static void *getMcontextEip(ucontext_t *uc) { + #if defined(__FreeBSD__) +- return (void*) uc->uc_mcontext.mc_eip; ++ return (void*) uc->uc_mcontext.mc_rip; + #elif defined(__dietlibc__) + return (void*) uc->uc_mcontext.eip; + #elif defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_6) diff -ruN databases/redis/files/patch-src::redis.c databases/redis/files/patch-src::redis.c --- databases/redis/files/patch-src::redis.c 2011-11-30 13:46:19.000000000 +0100 +++ databases/redis/files/patch-src::redis.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- src/redis.c.orig 2011-11-30 16:29:38.000000000 +0400 -+++ src/redis.c 2011-11-30 16:29:59.000000000 +0400 -@@ -1685,7 +1685,7 @@ - #ifdef HAVE_BACKTRACE - static void *getMcontextEip(ucontext_t *uc) { - #if defined(__FreeBSD__) -- return (void*) uc->uc_mcontext.mc_eip; -+ return (void*) uc->uc_mcontext.mc_rip; - #elif defined(__dietlibc__) - return (void*) uc->uc_mcontext.eip; - #elif defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_6) >Release-Note: >Audit-Trail: >Unformatted: