1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-18 00:10:04 +00:00

net/ipsumdump: Unbreak amd64 build after 64825b9

aggwtree.cc:859:7: error: use of undeclared identifier 'bswap_32'
                add(bswap_32(ubuf[2*i]), bswap_32(ubuf[2*i + 1]));
                    ^
aggwtree.cc:859:28: error: use of undeclared identifier 'bswap_32'
                add(bswap_32(ubuf[2*i]), bswap_32(ubuf[2*i + 1]));
                                         ^
2 errors generated.
gmake[1]: *** [Makefile:46: aggwtree.o] Error 1
gmake[1]: *** Waiting for unfinished jobs....
aggtree.cc:1139:7: error: use of undeclared identifier 'bswap_32'
                add(bswap_32(ubuf[2*i]), bswap_32(ubuf[2*i + 1]));
                    ^
aggtree.cc:1139:28: error: use of undeclared identifier 'bswap_32'
                add(bswap_32(ubuf[2*i]), bswap_32(ubuf[2*i + 1]));
                                         ^
2 errors generated.
This commit is contained in:
Craig Leres 2024-06-06 10:41:07 -07:00
parent aa1a31fa8e
commit 39a4ccbcc8
3 changed files with 17 additions and 15 deletions

View File

@ -1,6 +1,6 @@
PORTNAME= ipsumdump
DISTVERSION= 1.86
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= https://read.seas.harvard.edu/~kohler/ipsumdump/

View File

@ -1,13 +1,14 @@
--- src/aggtree.cc.orig 2024-06-01 22:57:34 UTC
--- src/aggtree.cc.orig 2014-05-02 12:23:53 UTC
+++ src/aggtree.cc
@@ -10,10 +10,6 @@
@@ -11,9 +11,11 @@
#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));
-}
#else
+#if !defined(__powerpc64__) && !defined(POWERPC64)
static inline uint32_t bswap_32(uint32_t u) {
return ((u >> 24) | ((u & 0xff0000) >> 8) | ((u & 0xff00) << 8) | ((u & 0xff) << 24));
}
+#endif
#endif

View File

@ -1,13 +1,14 @@
--- src/aggwtree.cc.orig 2024-06-01 22:57:44 UTC
--- src/aggwtree.cc.orig 2014-05-02 12:23:53 UTC
+++ src/aggwtree.cc
@@ -9,10 +9,6 @@
@@ -10,9 +10,11 @@
#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));
-}
#else
+#if !defined(__powerpc64__) && !defined(POWERPC64)
static inline uint32_t bswap_32(uint32_t u) {
return ((u >> 24) | ((u & 0xff0000) >> 8) | ((u & 0xff00) << 8) | ((u & 0xff) << 24));
}
+#endif
#endif
typedef AggregateWTree::WNode WNode;