git: 64825b99d9fd - main - net/ipsumdump: fix build on powerpc64
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 03 Jun 2024 15:12:32 UTC
The branch main has been updated by pkubaj:
URL: https://cgit.FreeBSD.org/ports/commit/?id=64825b99d9fd657489d45787f79d41a26aca7bdf
commit 64825b99d9fd657489d45787f79d41a26aca7bdf
Author: Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2024-06-01 23:12:16 +0000
Commit: Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2024-06-03 15:11:55 +0000
net/ipsumdump: fix build on powerpc64
aggtree.cc:14:24: error: static declaration of '__builtin_bswap32' follows non-static declaration
14 | static inline uint32_t bswap_32(uint32_t u) {
| ^
/usr/include/byteswap.h:38:21: note: expanded from macro 'bswap_32'
38 | #define bswap_32(x) __bswap32(x)
| ^
/usr/include/sys/_endian.h:84:22: note: expanded from macro '__bswap32'
84 | #define __bswap32(x) __builtin_bswap32(x)
| ^
---
net/ipsumdump/files/patch-src_aggtree.cc | 13 +++++++++++++
net/ipsumdump/files/patch-src_aggwtree.cc | 13 +++++++++++++
2 files changed, 26 insertions(+)
diff --git a/net/ipsumdump/files/patch-src_aggtree.cc b/net/ipsumdump/files/patch-src_aggtree.cc
new file mode 100644
index 000000000000..dc49fccb44f5
--- /dev/null
+++ b/net/ipsumdump/files/patch-src_aggtree.cc
@@ -0,0 +1,13 @@
+--- src/aggtree.cc.orig 2024-06-01 22:57:34 UTC
++++ src/aggtree.cc
+@@ -10,10 +10,6 @@
+
+ #ifdef HAVE_BYTEORDER_H
+ #include <byteorder.h>
+-#else
+-static inline uint32_t bswap_32(uint32_t u) {
+- return ((u >> 24) | ((u & 0xff0000) >> 8) | ((u & 0xff00) << 8) | ((u & 0xff) << 24));
+-}
+ #endif
+
+
diff --git a/net/ipsumdump/files/patch-src_aggwtree.cc b/net/ipsumdump/files/patch-src_aggwtree.cc
new file mode 100644
index 000000000000..ad10f30c1ef9
--- /dev/null
+++ b/net/ipsumdump/files/patch-src_aggwtree.cc
@@ -0,0 +1,13 @@
+--- src/aggwtree.cc.orig 2024-06-01 22:57:44 UTC
++++ src/aggwtree.cc
+@@ -9,10 +9,6 @@
+
+ #ifdef HAVE_BYTEORDER_H
+ #include <byteorder.h>
+-#else
+-static inline uint32_t bswap_32(uint32_t u) {
+- return ((u >> 24) | ((u & 0xff0000) >> 8) | ((u & 0xff00) << 8) | ((u & 0xff) << 24));
+-}
+ #endif
+
+ typedef AggregateWTree::WNode WNode;