aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsunpoet <sunpoet@FreeBSD.org>2018-03-01 21:35:47 +0800
committersunpoet <sunpoet@FreeBSD.org>2018-03-01 21:35:47 +0800
commit207fe04516c6ec1209a3d7f6e8cce9762a82e68e (patch)
tree3eb954b1c3e11dfdc9bfffd108ae900884a2ebdc
parentdf3fa66d8218e1542627ea4c122bd7b9f69c3ce5 (diff)
downloadfreebsd-ports-gnome-207fe04516c6ec1209a3d7f6e8cce9762a82e68e.tar.gz
freebsd-ports-gnome-207fe04516c6ec1209a3d7f6e8cce9762a82e68e.tar.zst
freebsd-ports-gnome-207fe04516c6ec1209a3d7f6e8cce9762a82e68e.zip
Fix build with msgpuck 2.0
-rw-r--r--www/nginx/Makefile3
-rw-r--r--www/nginx/files/extra-patch-ngx_http_tarantool-src-tp_transcode.c13
2 files changed, 15 insertions, 1 deletions
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 843b179166e7..89a27f369764 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -701,7 +701,8 @@ CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_nginx_tarantool}
.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}
diff --git a/www/nginx/files/extra-patch-ngx_http_tarantool-src-tp_transcode.c b/www/nginx/files/extra-patch-ngx_http_tarantool-src-tp_transcode.c
new file mode 100644
index 000000000000..f2c71685a9a7
--- /dev/null
+++ b/www/nginx/files/extra-patch-ngx_http_tarantool-src-tp_transcode.c
@@ -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"
+