CVS commit: pkgsrc/devel/libthrift

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue May 15 10:16:17 UTC 2018

Modified Files:
        pkgsrc/devel/libthrift: PLIST distinfo options.mk
Added Files:
        pkgsrc/devel/libthrift/patches:
            patch-lib_cpp_src_thrift_server_TNonblockingServer.cpp

Log Message:
libthrift: Fix strings.h and building without lua.

This package is very broken, building with perl/python options enabled
fails, and a lot of options are missing from PKG_SUPPORTED_OPTIONS.  If
nobody cares about language bindings we should just disable them all and
significantly simplify the package.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/libthrift/PLIST
cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/libthrift/distinfo
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/libthrift/options.mk
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/libthrift/patches/patch-lib_cpp_src_thrift_server_TNonblockingServer.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/libthrift/PLIST
diff -u pkgsrc/devel/libthrift/PLIST:1.10 pkgsrc/devel/libthrift/PLIST:1.11
--- pkgsrc/devel/libthrift/PLIST:1.10   Sun Apr  1 10:21:28 2018
+++ pkgsrc/devel/libthrift/PLIST        Tue May 15 10:16:17 2018
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.10 2018/04/01 10:21:28 wiz Exp $
+@comment $NetBSD: PLIST,v 1.11 2018/05/15 10:16:17 jperkin Exp $
 bin/thrift
-include/src/socket.h
+${PLIST.lua}include/src/socket.h
 include/thrift/TApplicationException.h
 include/thrift/TBase.h
 include/thrift/TDispatchProcessor.h
@@ -88,10 +88,10 @@ include/thrift/transport/TTransportExcep
 include/thrift/transport/TTransportUtils.h
 include/thrift/transport/TVirtualTransport.h
 include/thrift/transport/TZlibTransport.h
-lib/libluabitwise.la
-lib/libluabpack.la
-lib/liblualongnumber.la
-lib/libluasocket.la
+${PLIST.lua}lib/libluabitwise.la
+${PLIST.lua}lib/libluabpack.la
+${PLIST.lua}lib/liblualongnumber.la
+${PLIST.lua}lib/libluasocket.la
 lib/libthrift.la
 lib/libthriftnb.la
 lib/libthriftz.la

Index: pkgsrc/devel/libthrift/distinfo
diff -u pkgsrc/devel/libthrift/distinfo:1.17 pkgsrc/devel/libthrift/distinfo:1.18
--- pkgsrc/devel/libthrift/distinfo:1.17        Sun Apr  1 10:21:28 2018
+++ pkgsrc/devel/libthrift/distinfo     Tue May 15 10:16:17 2018
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.17 2018/04/01 10:21:28 wiz Exp $
+$NetBSD: distinfo,v 1.18 2018/05/15 10:16:17 jperkin Exp $
 
 SHA1 (thrift-0.11.0.tar.gz) = bdf159ef455c6d3c71e95dba15a6d05f6aaca2a9
 RMD160 (thrift-0.11.0.tar.gz) = 133be0130b1bc0cce1aaa1b6a291bbfd8cbb32a6
 SHA512 (thrift-0.11.0.tar.gz) = c0e00d542b1bd6cad317dfa48c547742eb42eacc2517f65d8e8478eb650138c3233e537f6037c99433857e96737381b3c091ed08dd74ef7f2fe3aec02cd5de2b
 Size (thrift-0.11.0.tar.gz) = 3667154 bytes
 SHA1 (patch-configure) = 41111e61809e382aaf0b0c6cce410d659365ee16
+SHA1 (patch-lib_cpp_src_thrift_server_TNonblockingServer.cpp) = 9850315d9e55d2abd6055e11b179c785ac812a41

Index: pkgsrc/devel/libthrift/options.mk
diff -u pkgsrc/devel/libthrift/options.mk:1.11 pkgsrc/devel/libthrift/options.mk:1.12
--- pkgsrc/devel/libthrift/options.mk:1.11      Wed Apr 11 09:10:28 2018
+++ pkgsrc/devel/libthrift/options.mk   Tue May 15 10:16:17 2018
@@ -1,11 +1,11 @@
-# $NetBSD: options.mk,v 1.11 2018/04/11 09:10:28 maya Exp $
+# $NetBSD: options.mk,v 1.12 2018/05/15 10:16:17 jperkin Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.libthrift
-PKG_SUPPORTED_OPTIONS= perl python # csharp java erlang php ruby
+PKG_SUPPORTED_OPTIONS= lua perl python # csharp java erlang php ruby
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=           csharp erlang java perl php python ruby
+PLIST_VARS+=           csharp erlang java lua perl php python ruby
 
 .if !empty(PKG_OPTIONS:Mcsharp)
 CONFIGURE_ARGS+=       --with-csharp
@@ -44,6 +44,14 @@ PLIST.erlang=                yes
 CONFIGURE_ARGS+=       --without-erlang
 .endif
 
+.if !empty(PKG_OPTIONS:Mlua)
+CONFIGURE_ARGS+=       --with-lua
+.include "../../lang/lua/buildlink3.mk"
+PLIST.lua=             yes
+.else
+CONFIGURE_ARGS+=       --without-lua
+.endif
+
 .if !empty(PKG_OPTIONS:Mpython)
 CONFIGURE_ARGS+=       --with-python
 CONFIGURE_ARGS+=       --enable-gen-py

Added files:

Index: pkgsrc/devel/libthrift/patches/patch-lib_cpp_src_thrift_server_TNonblockingServer.cpp
diff -u /dev/null pkgsrc/devel/libthrift/patches/patch-lib_cpp_src_thrift_server_TNonblockingServer.cpp:1.1
--- /dev/null   Tue May 15 10:16:17 2018
+++ pkgsrc/devel/libthrift/patches/patch-lib_cpp_src_thrift_server_TNonblockingServer.cpp       Tue May 15 10:16:17 2018
@@ -0,0 +1,17 @@
+$NetBSD: patch-lib_cpp_src_thrift_server_TNonblockingServer.cpp,v 1.1 2018/05/15 10:16:17 jperkin Exp $
+
+Need strings.h for bzero().
+
+--- lib/cpp/src/thrift/server/TNonblockingServer.cpp.orig      2017-12-03 19:11:36.000000000 +0000
++++ lib/cpp/src/thrift/server/TNonblockingServer.cpp
+@@ -71,6 +71,10 @@
+ #include <stdint.h>
+ #endif
+ 
++#ifdef HAVE_STRINGS_H
++#include <strings.h>
++#endif
++
+ namespace apache {
+ namespace thrift {
+ namespace server {