Mon Apr 25 09:33:40 2022 UTC ()
mongo-c-driver: handle --version-script on SunOS


(tnn)
diff -r1.54 -r1.55 pkgsrc/databases/mongo-c-driver/Makefile
diff -r1.43 -r1.44 pkgsrc/databases/mongo-c-driver/distinfo
diff -r0 -r1.1 pkgsrc/databases/mongo-c-driver/patches/patch-src_libmongoc_tests_test-mongoc-stream-tls-error.c
cvs diff -r1.54 -r1.55 pkgsrc/databases/mongo-c-driver/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/mongo-c-driver/Makefile 2022/04/18 19:09:43 1.54
+++ pkgsrc/databases/mongo-c-driver/Makefile 2022/04/25 09:33:39 1.55
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.54 2022/04/18 19:09:43 adam Exp $ 1# $NetBSD: Makefile,v 1.55 2022/04/25 09:33:39 tnn Exp $
2 2
3DISTNAME= mongo-c-driver-1.17.7 3DISTNAME= mongo-c-driver-1.17.7
4PKGREVISION= 2 4PKGREVISION= 2
5CATEGORIES= databases 5CATEGORIES= databases
6MASTER_SITES= ${MASTER_SITE_GITHUB:=mongodb/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=mongodb/}
7GITHUB_RELEASE= ${PKGVERSION_NOREV} 7GITHUB_RELEASE= ${PKGVERSION_NOREV}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://github.com/mongodb/mongo-c-driver 10HOMEPAGE= https://github.com/mongodb/mongo-c-driver
11COMMENT= MongoDB client library written in C 11COMMENT= MongoDB client library written in C
12LICENSE= apache-2.0 12LICENSE= apache-2.0
13 13
14# Requires shm_open() 14# Requires shm_open()
@@ -22,27 +22,28 @@ CMAKE_ARGS+= -DENABLE_ICU=ON @@ -22,27 +22,28 @@ CMAKE_ARGS+= -DENABLE_ICU=ON
22#CMAKE_ARGS+= -DENABLE_MAN_PAGES=ON 22#CMAKE_ARGS+= -DENABLE_MAN_PAGES=ON
23CMAKE_ARGS+= -DENABLE_SNAPPY=SYSTEM 23CMAKE_ARGS+= -DENABLE_SNAPPY=SYSTEM
24CMAKE_ARGS+= -DENABLE_UNINSTALL=OFF 24CMAKE_ARGS+= -DENABLE_UNINSTALL=OFF
25CMAKE_ARGS+= -DENABLE_ZLIB=SYSTEM 25CMAKE_ARGS+= -DENABLE_ZLIB=SYSTEM
26 26
27PKGCONFIG_OVERRIDE+= src/libbson/src/libbson-1.0.pc.in 27PKGCONFIG_OVERRIDE+= src/libbson/src/libbson-1.0.pc.in
28PKGCONFIG_OVERRIDE+= src/libbson/src/libbson-static-1.0.pc.in 28PKGCONFIG_OVERRIDE+= src/libbson/src/libbson-static-1.0.pc.in
29PKGCONFIG_OVERRIDE+= src/libmongoc/src/libmongoc-1.0.pc.in 29PKGCONFIG_OVERRIDE+= src/libmongoc/src/libmongoc-1.0.pc.in
30PKGCONFIG_OVERRIDE+= src/libmongoc/src/libmongoc-ssl-1.0.pc.in 30PKGCONFIG_OVERRIDE+= src/libmongoc/src/libmongoc-ssl-1.0.pc.in
31PKGCONFIG_OVERRIDE+= src/libmongoc/src/libmongoc-static-1.0.pc.in 31PKGCONFIG_OVERRIDE+= src/libmongoc/src/libmongoc-static-1.0.pc.in
32 32
33INSTALLATION_DIRS+= ${PKGMANDIR}/man3 33INSTALLATION_DIRS+= ${PKGMANDIR}/man3
34 34
35LDFLAGS.SunOS+= -lsocket 35LDFLAGS.SunOS+= -lsocket
 36BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--version-script=${WRKSRC}/src/libmongoc/../../build/cmake/libmongoc-hidden-symbols.map
36 37
37PLIST_VARS+= unix 38PLIST_VARS+= unix
38 39
39.include "../../mk/bsd.prefs.mk" 40.include "../../mk/bsd.prefs.mk"
40.if ${OPSYS} != "Darwin" 41.if ${OPSYS} != "Darwin"
41PLIST.unix= yes 42PLIST.unix= yes
42.endif 43.endif
43 44
44.include "options.mk" 45.include "options.mk"
45 46
46post-install: 47post-install:
47.for lib in libbson libmongoc 48.for lib in libbson libmongoc
48 ${INSTALL_MAN} ${WRKSRC}/src/${lib}/doc/man/*.3 \ 49 ${INSTALL_MAN} ${WRKSRC}/src/${lib}/doc/man/*.3 \
cvs diff -r1.43 -r1.44 pkgsrc/databases/mongo-c-driver/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/mongo-c-driver/distinfo 2021/10/26 10:09:24 1.43
+++ pkgsrc/databases/mongo-c-driver/distinfo 2022/04/25 09:33:39 1.44
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.43 2021/10/26 10:09:24 nia Exp $ 1$NetBSD: distinfo,v 1.44 2022/04/25 09:33:39 tnn Exp $
2 2
3BLAKE2s (mongo-c-driver-1.17.7.tar.gz) = 078a64e799b65a9ac62b4a4a2d69a36f523c05136a6e867741fb918328a235d7 3BLAKE2s (mongo-c-driver-1.17.7.tar.gz) = 078a64e799b65a9ac62b4a4a2d69a36f523c05136a6e867741fb918328a235d7
4SHA512 (mongo-c-driver-1.17.7.tar.gz) = 766f1182165540e770f5d3661f7462cedeee3b8a43a560dc719f045c21da62d0d24586686bcdc387a921fc890af806bebf23e9c9f196fad4664053c0bfe3f0c9 4SHA512 (mongo-c-driver-1.17.7.tar.gz) = 766f1182165540e770f5d3661f7462cedeee3b8a43a560dc719f045c21da62d0d24586686bcdc387a921fc890af806bebf23e9c9f196fad4664053c0bfe3f0c9
5Size (mongo-c-driver-1.17.7.tar.gz) = 7092885 bytes 5Size (mongo-c-driver-1.17.7.tar.gz) = 7092885 bytes
 6SHA1 (patch-src_libmongoc_tests_test-mongoc-stream-tls-error.c) = 856e4b44414e1ff6db12440c41d1aae9bf8046aa
File Added: pkgsrc/databases/mongo-c-driver/patches/patch-src_libmongoc_tests_test-mongoc-stream-tls-error.c
$NetBSD: patch-src_libmongoc_tests_test-mongoc-stream-tls-error.c,v 1.1 2022/04/25 09:33:40 tnn Exp $

match ifdef around test_mongoc_tls_hangup implementation

--- src/libmongoc/tests/test-mongoc-stream-tls-error.c.orig	2021-07-06 20:11:18.000000000 +0000
+++ src/libmongoc/tests/test-mongoc-stream-tls-error.c
@@ -389,7 +389,7 @@ test_stream_tls_error_install (TestSuite
 {
 #if !defined(MONGOC_ENABLE_SSL_SECURE_CHANNEL) && \
    !defined(MONGOC_ENABLE_SSL_LIBRESSL)
-#if !defined(__APPLE__)
+#if !defined(__sun) && !defined(__APPLE__)
    TestSuite_Add (suite, "/TLS/hangup", test_mongoc_tls_hangup);
 #endif