CVS commit: pkgsrc/devel/librdkafka

["Filip Hajny" <fhajny%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   fhajny
Date:           Mon Apr 24 12:20:37 UTC 2017

Modified Files:
        pkgsrc/devel/librdkafka: Makefile distinfo
        pkgsrc/devel/librdkafka/patches: patch-src_rdkafka__broker.c
Added Files:
        pkgsrc/devel/librdkafka/patches: patch-Makefile patch-src_rd.h
            patch-src_rdendian.h patch-src_rdposix.h patch-src_snappy__compat.h

Log Message:
* Use bash for CONFIG_SHELL
* Fix build on NetBSD
* Uses python to build
* Enable tests


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/librdkafka/Makefile \
    pkgsrc/devel/librdkafka/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/librdkafka/patches/patch-Makefile \
    pkgsrc/devel/librdkafka/patches/patch-src_rd.h \
    pkgsrc/devel/librdkafka/patches/patch-src_rdendian.h \
    pkgsrc/devel/librdkafka/patches/patch-src_rdposix.h \
    pkgsrc/devel/librdkafka/patches/patch-src_snappy__compat.h
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/librdkafka/patches/patch-src_rdkafka__broker.c

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

Modified files:

Index: pkgsrc/devel/librdkafka/Makefile
diff -u pkgsrc/devel/librdkafka/Makefile:1.1 pkgsrc/devel/librdkafka/Makefile:1.2
--- pkgsrc/devel/librdkafka/Makefile:1.1        Thu Apr 20 08:01:18 2017
+++ pkgsrc/devel/librdkafka/Makefile    Mon Apr 24 12:20:37 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/04/20 08:01:18 fhajny Exp $
+# $NetBSD: Makefile,v 1.2 2017/04/24 12:20:37 fhajny Exp $
 
 DISTNAME=      librdkafka-0.9.5
 CATEGORIES=    devel
@@ -15,13 +15,20 @@ HAS_CONFIGURE=      yes
 USE_LANGUAGES= c c99 c++
 USE_TOOLS+=    bash gmake pkg-config
 
+CONFIG_SHELL=  bash
+
 CONFIGURE_ARGS+=       --prefix=${PREFIX}
 CONFIGURE_ARGS+=       --enable-lz4
 CONFIGURE_ARGS+=       --enable-ssl
 CONFIGURE_ARGS+=       --disable-sasl
 
+TEST_TARGET=   check
+
+PYTHON_FOR_BUILD_ONLY= yes
+
 .include "../../archivers/lz4/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../lang/python/tool.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/librdkafka/distinfo
diff -u pkgsrc/devel/librdkafka/distinfo:1.1 pkgsrc/devel/librdkafka/distinfo:1.2
--- pkgsrc/devel/librdkafka/distinfo:1.1        Thu Apr 20 08:01:18 2017
+++ pkgsrc/devel/librdkafka/distinfo    Mon Apr 24 12:20:37 2017
@@ -1,7 +1,12 @@
-$NetBSD: distinfo,v 1.1 2017/04/20 08:01:18 fhajny Exp $
+$NetBSD: distinfo,v 1.2 2017/04/24 12:20:37 fhajny Exp $
 
 SHA1 (librdkafka-0.9.5.tar.gz) = 8cc5ba85d18104c644d7bb9e4e64e8c95cd2f100
 RMD160 (librdkafka-0.9.5.tar.gz) = 56343b3724acb09a2df0f7a42830426bea392158
 SHA512 (librdkafka-0.9.5.tar.gz) = 06b2c7e3dd1c8a84322d256f2470804ba0ac205777cf66c0c98222d3f90ed26d6fcae375ee0343558ccf901d7a8d354009f377a435ecd0ce2d02c73848fbc8a4
 Size (librdkafka-0.9.5.tar.gz) = 753196 bytes
-SHA1 (patch-src_rdkafka__broker.c) = 6c123399f7472e2727731e307ff90a52712f7ec3
+SHA1 (patch-Makefile) = 31731833723acada1c53d01a632f8ba726788a5a
+SHA1 (patch-src_rd.h) = 698000dcad93ccaa07e2462e0932967272b2a915
+SHA1 (patch-src_rdendian.h) = 2c01666fa2ad35415180e272223d3be13d91f7f8
+SHA1 (patch-src_rdkafka__broker.c) = 3be69e335317eaa8dea196a5f28856085788c034
+SHA1 (patch-src_rdposix.h) = 72ac80d3ac57a87b3c289b3c7a8698234af9984c
+SHA1 (patch-src_snappy__compat.h) = c728f0e575ccf944d6990aa64cc4ccd926e4e5d4

Index: pkgsrc/devel/librdkafka/patches/patch-src_rdkafka__broker.c
diff -u pkgsrc/devel/librdkafka/patches/patch-src_rdkafka__broker.c:1.1 pkgsrc/devel/librdkafka/patches/patch-src_rdkafka__broker.c:1.2
--- pkgsrc/devel/librdkafka/patches/patch-src_rdkafka__broker.c:1.1     Thu Apr 20 08:01:19 2017
+++ pkgsrc/devel/librdkafka/patches/patch-src_rdkafka__broker.c Mon Apr 24 12:20:37 2017
@@ -1,15 +1,16 @@
-$NetBSD: patch-src_rdkafka__broker.c,v 1.1 2017/04/20 08:01:19 fhajny Exp $
+$NetBSD: patch-src_rdkafka__broker.c,v 1.2 2017/04/24 12:20:37 fhajny Exp $
 
-XPG6 is needed.
+Do not mess with _XOPEN_SOURCE here, it's needed generally and elsewhere.
 
 --- src/rdkafka_broker.c.orig  2017-04-12 08:36:34.000000000 +0000
 +++ src/rdkafka_broker.c
-@@ -31,7 +31,7 @@
+@@ -30,9 +30,6 @@
+ 
  #ifndef _MSC_VER
  #define _GNU_SOURCE
- #ifndef _AIX    /* AIX defines this and the value needs to be set correctly */
+-#ifndef _AIX    /* AIX defines this and the value needs to be set correctly */
 -#define _XOPEN_SOURCE
-+#define _XOPEN_SOURCE 600
- #endif
+-#endif
  #include <signal.h>
  #endif
+ 

Added files:

Index: pkgsrc/devel/librdkafka/patches/patch-Makefile
diff -u /dev/null pkgsrc/devel/librdkafka/patches/patch-Makefile:1.1
--- /dev/null   Mon Apr 24 12:20:37 2017
+++ pkgsrc/devel/librdkafka/patches/patch-Makefile      Mon Apr 24 12:20:37 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile,v 1.1 2017/04/24 12:20:37 fhajny Exp $
+
+Do not test as part of build.
+
+--- Makefile.orig      2017-04-12 08:36:34.000000000 +0000
++++ Makefile
+@@ -12,7 +12,7 @@ BUILD_NUMBER ?= 1
+ 
+ .PHONY:
+ 
+-all: mklove-check libs CONFIGURATION.md check
++all: mklove-check libs CONFIGURATION.md
+ 
+ include mklove/Makefile.base
+ 
Index: pkgsrc/devel/librdkafka/patches/patch-src_rd.h
diff -u /dev/null pkgsrc/devel/librdkafka/patches/patch-src_rd.h:1.1
--- /dev/null   Mon Apr 24 12:20:37 2017
+++ pkgsrc/devel/librdkafka/patches/patch-src_rd.h      Mon Apr 24 12:20:37 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_rd.h,v 1.1 2017/04/24 12:20:37 fhajny Exp $
+
+Unlock IOV_MAX on NetBSD and other guards.
+
+--- src/rd.h.orig      2017-04-12 08:36:34.000000000 +0000
++++ src/rd.h
+@@ -40,6 +40,8 @@
+ #endif
+ #endif
+ 
++#define _XOPEN_SOURCE 600
++
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
Index: pkgsrc/devel/librdkafka/patches/patch-src_rdendian.h
diff -u /dev/null pkgsrc/devel/librdkafka/patches/patch-src_rdendian.h:1.1
--- /dev/null   Mon Apr 24 12:20:37 2017
+++ pkgsrc/devel/librdkafka/patches/patch-src_rdendian.h        Mon Apr 24 12:20:37 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_rdendian.h,v 1.1 2017/04/24 12:20:37 fhajny Exp $
+
+Add NetBSD support.
+
+--- src/rdendian.h.orig        2017-04-12 08:36:34.000000000 +0000
++++ src/rdendian.h
+@@ -38,7 +38,7 @@
+  *   htobe16()
+  */
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+   #include <sys/endian.h>
+ #elif defined __GLIBC__
+   #include <endian.h>
Index: pkgsrc/devel/librdkafka/patches/patch-src_rdposix.h
diff -u /dev/null pkgsrc/devel/librdkafka/patches/patch-src_rdposix.h:1.1
--- /dev/null   Mon Apr 24 12:20:37 2017
+++ pkgsrc/devel/librdkafka/patches/patch-src_rdposix.h Mon Apr 24 12:20:37 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_rdposix.h,v 1.1 2017/04/24 12:20:37 fhajny Exp $
+
+Add NetBSD support.
+
+--- src/rdposix.h.orig 2017-04-12 08:36:34.000000000 +0000
++++ src/rdposix.h
+@@ -63,7 +63,7 @@
+ /**
+ * Allocation
+ */
+-#if !defined(__FreeBSD__)
++#if !defined(__FreeBSD__) && !defined(__NetBSD__)
+ /* alloca(3) is in stdlib on FreeBSD */
+ #include <alloca.h>
+ #endif
Index: pkgsrc/devel/librdkafka/patches/patch-src_snappy__compat.h
diff -u /dev/null pkgsrc/devel/librdkafka/patches/patch-src_snappy__compat.h:1.1
--- /dev/null   Mon Apr 24 12:20:37 2017
+++ pkgsrc/devel/librdkafka/patches/patch-src_snappy__compat.h  Mon Apr 24 12:20:37 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_snappy__compat.h,v 1.1 2017/04/24 12:20:37 fhajny Exp $
+
+Add NetBSD support.
+
+--- src/snappy_compat.h.orig   2017-04-12 08:36:34.000000000 +0000
++++ src/snappy_compat.h
+@@ -3,7 +3,7 @@
+ 
+ 
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+ #  include <sys/endian.h>
+ #elif defined(__APPLE_CC_) || defined(__MACH__)  /* MacOS/X support */
+ #  include <machine/endian.h>