git: 3cbdb6722c37 - main - net/librdkafka: update to 2.2.0

The branch main has been updated by pizzamig:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3cbdb6722c379fd8885ddb4def996a60862037d1

commit 3cbdb6722c379fd8885ddb4def996a60862037d1
Author:     Luca Pizzamiglio <pizzamig@FreeBSD.org>
AuthorDate: 2023-07-23 20:22:02 +0000
Commit:     Luca Pizzamiglio <pizzamig@FreeBSD.org>
CommitDate: 2023-07-23 20:22:02 +0000

    net/librdkafka: update to 2.2.0
    
    Update patches, to re-enable atomic operations in 64bit
---
 net/librdkafka/Makefile                              |  2 +-
 net/librdkafka/distinfo                              |  6 +++---
 .../files/patch-mklove_modules_configure.atomics     | 20 --------------------
 net/librdkafka/files/patch-src_rd.h                  |  6 +++---
 4 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/net/librdkafka/Makefile b/net/librdkafka/Makefile
index 421d8017bf58..5cfc8975fbf3 100644
--- a/net/librdkafka/Makefile
+++ b/net/librdkafka/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	librdkafka
-DISTVERSION=	2.0.2
+DISTVERSION=	2.2.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net
 
diff --git a/net/librdkafka/distinfo b/net/librdkafka/distinfo
index e99404c22181..3deb5b516be9 100644
--- a/net/librdkafka/distinfo
+++ b/net/librdkafka/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1675359576
-SHA256 (edenhill-librdkafka-v2.0.2_GH0.tar.gz) = f321bcb1e015a34114c83cf1aa7b99ee260236aab096b85c003170c90a47ca9d
-SIZE (edenhill-librdkafka-v2.0.2_GH0.tar.gz) = 4257782
+TIMESTAMP = 1690132543
+SHA256 (edenhill-librdkafka-v2.2.0_GH0.tar.gz) = af9a820cbecbc64115629471df7c7cecd40403b6c34bfdbb9223152677a47226
+SIZE (edenhill-librdkafka-v2.2.0_GH0.tar.gz) = 4340164
diff --git a/net/librdkafka/files/patch-mklove_modules_configure.atomics b/net/librdkafka/files/patch-mklove_modules_configure.atomics
deleted file mode 100644
index 94953907239d..000000000000
--- a/net/librdkafka/files/patch-mklove_modules_configure.atomics
+++ /dev/null
@@ -1,20 +0,0 @@
---- mklove/modules/configure.atomics.orig	2018-07-23 09:49:13 UTC
-+++ mklove/modules/configure.atomics
-@@ -93,7 +93,7 @@ int32_t foo (int32_t i) {
-     if ! mkl_compile_check __atomic_64 HAVE_ATOMICS_64 cont CC "" \
-         "
- #include <inttypes.h>
--int64_t foo (int64_t i) {
-+int64_t foo (int64_t i) __attribute__((noinline)) {
-   return __atomic_add_fetch(&i, 1, __ATOMIC_SEQ_CST);
- }"
-         then
-@@ -102,7 +102,7 @@ int64_t foo (int64_t i) {
-             cont CC "" \
-             "
- #include <inttypes.h>
--int64_t foo (int64_t i) {
-+int64_t foo (int64_t i) __attribute__((noinline)) {
-   return __atomic_add_fetch(&i, 1, __ATOMIC_SEQ_CST);
- }"
-         then
diff --git a/net/librdkafka/files/patch-src_rd.h b/net/librdkafka/files/patch-src_rd.h
index 7484d4711d47..0258bfd1f1bc 100644
--- a/net/librdkafka/files/patch-src_rd.h
+++ b/net/librdkafka/files/patch-src_rd.h
@@ -1,8 +1,8 @@
---- src/rd.h.orig	2017-01-25 12:25:17 UTC
+--- src/rd.h.orig	2023-07-12 09:03:32 UTC
 +++ src/rd.h
-@@ -38,6 +38,12 @@
+@@ -43,6 +43,12 @@
  #ifndef _POSIX_C_SOURCE
- #define _POSIX_C_SOURCE 200809L  /* for timespec on solaris */
+ #define _POSIX_C_SOURCE 200809L /* for timespec on solaris */
  #endif
 +#ifndef __XSI_VISIBLE
 +#define __XSI_VISIBLE 700 /* for gettimeofday() */