svn commit: r463319 - in head/www/nginx: . files

[Sunpoet Po-Chuan Hsieh]

On Fri, Mar 2, 2018 at 12:14 AM, Jochen Neumeister <joneum at freebsd.org>
wrote:

>
>
> Am 01.03.2018 um 15:44 schrieb Sunpoet Po-Chuan Hsieh:
>
> On Thu, Mar 1, 2018 at 10:37 PM, Jochen Neumeister <joneum at freebsd.org>
> 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"
>> +
>>
>>
>>
>>
>
>