From owner-svn-ports-head@freebsd.org Fri Mar 2 13:29:10 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5B14DF455AE for ; Fri, 2 Mar 2018 13:29:10 +0000 (UTC) (envelope-from sunpoet@sunpoet.net) Received: from mail-io0-x230.google.com (mail-io0-x230.google.com [IPv6:2607:f8b0:4001:c06::230]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E7E6080AED for ; Fri, 2 Mar 2018 13:29:09 +0000 (UTC) (envelope-from sunpoet@sunpoet.net) Received: by mail-io0-x230.google.com with SMTP id u84so10600083iod.9 for ; Fri, 02 Mar 2018 05:29:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sunpoet-net.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=HhdU2nTw/s4EEGi3UJJiUfejCIA2zXJKTYJFgXDOXr0=; b=rbDznqcPNRPC60TBLcOQ9fE4KI9dQQYrPp8B96LMNxxQXxpyHBAG0FSohh+t1VPKWh qBUE6XMdhuZgFwTAnkePUz95jT2rxk5k4701HEbE1k1LJ+MFKeHs/yDYv+E5fOxCV6vP onAdXDr+v1zgNhWlInDb6kL/byMNY06qCwaPoqe5DvZKkGcctbSQHiDLgg+0VVLaWAi/ GedEW7j3aKh9ELO8ECoM7sgE+1hcNSkY++9EheUnsJ+02PGFGzxwCQKbEhxRWseXR7wD cPVUT0+ZWipVPdSFRBISJVuZkOtSfxbqxce1BnEcYpGT1TJi/2X5XNlfg674LBsnp+oi e/vw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=HhdU2nTw/s4EEGi3UJJiUfejCIA2zXJKTYJFgXDOXr0=; b=Cnk5HnBhBtRXPqcBET7XX7yPHsNL4WyYQU01Gsy4k5wryXXtcwbx6COA0zFyRlENCy Qure4cklajE4fv+vki1abbPf+CdQ23qeisqI93G+IN1JWI42XcA/no/jC5QLysHR8XBy Nv94mxDVhj4GzQhK7Eu+h+Ic4eLcJw+bOAjaXrZiuTCWYczPt8NvEwrBamGJn1Ix3FPS +0dow4PcwrZT/YpHVU4rz5f2/SzqVB6lp8/oLqLSfOwqvNb97khdvrO6xZArrWLfaTSB qTf8DpWGCZY3zGWB5WJi9r1RK+QWXtxNut5gVd2pc+bmtUF9u56A2knWihyql5j90yY3 yz2g== X-Gm-Message-State: AElRT7EBofAaTy11965O8RPTPvczErQqEzFW/D+5aMYcpEBgGlZCT//y Hz2IkxCkPl1POUyQ0JTYvCJPL79vQjg7irjnVkID5g== X-Google-Smtp-Source: AG47ELu43xg1wmYovee7hQN2MROAbVBR+UTOjWhT/9A5uiixRUlotNshTD8w3IS1CXyxse0QSBil5Q1L+FGek/FobSc= X-Received: by 10.107.21.3 with SMTP id 3mr6123701iov.148.1519997349273; Fri, 02 Mar 2018 05:29:09 -0800 (PST) MIME-Version: 1.0 Sender: sunpoet@sunpoet.net Received: by 10.2.145.7 with HTTP; Fri, 2 Mar 2018 05:28:28 -0800 (PST) In-Reply-To: References: <201803011335.w21DZl3h071754@repo.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Fri, 2 Mar 2018 21:28:28 +0800 X-Google-Sender-Auth: ll0NqtyCU5tjwvnMEeWcvBgtXeo Message-ID: Subject: Re: svn commit: r463319 - in head/www/nginx: . files To: Jochen Neumeister Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.25 X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Mar 2018 13:29:10 -0000 On Fri, Mar 2, 2018 at 12:14 AM, Jochen Neumeister wrote: > > > Am 01.03.2018 um 15:44 schrieb Sunpoet Po-Chuan Hsieh: > > On Thu, Mar 1, 2018 at 10:37 PM, Jochen Neumeister > wrote: > >> >> >> Am 01.03.2018 um 14:35 schrieb Sunpoet Po-Chuan Hsieh: >> >> Author: sunpoet >> Date: Thu Mar 1 13:35:47 2018 >> New Revision: 463319 >> URL: https://svnweb.freebsd.org/changeset/ports/463319 >> >> Log: >> Fix build with msgpuck 2.0 >> >> >> It would be very nice of you to ask next time if that's ok! >> >> joneum >> > > Hi, > > I've sent a review before. It's the simpler fix. > > Regards, > sunpoet > > > Then it would be even better if you wait until you get an okay! > I have not given the review a go yet. > > joneum > > FYI. In newer msgpuck, it has: #if defined(MP_SOURCE) #error MP_SOURCE is not supported anymore, please link libmsgpuck.a #endif This trivial build fix is already covered by blanket approval. Regards, sunpoet > > >> >> Added: >> head/www/nginx/files/extra-patch-ngx_http_tarantool-src-tp_transcode.c (contents, props changed) >> Modified: >> head/www/nginx/Makefile >> >> Modified: head/www/nginx/Makefile >> ============================================================================== >> --- head/www/nginx/Makefile Thu Mar 1 13:35:41 2018 (r463318) >> +++ head/www/nginx/Makefile Thu Mar 1 13:35:47 2018 (r463319) >> @@ -701,7 +701,8 @@ CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_nginx_ta >> .else >> CONFIGURE_ARGS+=--add-module=${WRKSRC_nginx_tarantool} >> .endif >> -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_tarantool-config >> +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_tarantool-config \ >> + ${PATCHDIR}/extra-patch-ngx_http_tarantool-src-tp_transcode.c >> .endif >> >> .if ${PORT_OPTIONS:MHTTP_SECURE_LINK} >> >> Added: head/www/nginx/files/extra-patch-ngx_http_tarantool-src-tp_transcode.c >> ============================================================================== >> --- /dev/null 00:00:00 1970 (empty, because file is newly added) >> +++ head/www/nginx/files/extra-patch-ngx_http_tarantool-src-tp_transcode.c Thu Mar 1 13:35:47 2018 (r463319) >> @@ -0,0 +1,13 @@ >> +--- ../nginx_upstream_module-1278ee5/src/tp_transcode.c.orig 2016-08-08 03:39:47.000000000 +0800 >> ++++ ../nginx_upstream_module-1278ee5/src/tp_transcode.c 2018-03-01 04:23:02.513740000 +0800 >> +@@ -38,10 +38,6 @@ >> + # define GNU_SOURCES 1 >> + #endif /* !GNU_SOURCES */ >> + >> +-#if !defined(MP_SOURCE) >> +-# define MP_SOURCE 1 >> +-#endif /* !MP_SOURCE */ >> +- >> + #include "tp_ext.h" >> + #include "tp_transcode.h" >> + >> >> >> >> > >