From nobody Thu Jun 6 17:41:37 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VwBTY4tjQz5NN3f; Thu, 06 Jun 2024 17:41:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VwBTY47Ysz4PrT; Thu, 6 Jun 2024 17:41:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717695697; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tDifyVSqFrBhfs2mUqETVqJ1fKiPt3Cnr0g8znrH+ug=; b=Rgd+IgJcdFez+3u53/qMzRZGo6Ji8eWLJ4GNpZnONmXBjper1L2M8/9a5VMlTe0kr8uuhO C9Fu2+jQ6lMXvN2FedoSNBRe6iGO87Su5YYgxHqecAFOA/LMR0RoHForma7hAzlU78yS5O AwYNdbiarM9tLq6wic4vJFzb8yQfDReSar46pQnI4BNBjXlJpe06XTt+vyJT3CYFaK8B9g bDnWDo0bQ1jZgsecZ9xauFRF8yoY30GSdfJrcZ22zK4KQD53cti7KrGY5yLffUIELV/8Vy DjBAIWBfyYgZbAMg75JoNXw7YZna6eBSv4di/a53WiGrQGC+jS/Nai3MaUBDaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717695697; a=rsa-sha256; cv=none; b=c432+vuuf0JonaR2n94gQRuYB6ijFuKkCYSJnWH+3wJMqNyhX4TT4e9vAa3apy7MVMO7fh 43o4XfnbjLTWxJhF0KGTNZuj10qg2ssxy77fPcxu4Z+CqGWV3OMxXbcsjheC33XYu6LYCs e19uib2bJw7aV1Fi9fyPLNJeXNVbSXE7W8lt0aZWmjsH4zAthwyM+Q8Vhe7XCFQuMLBYwt TVuGqGqiHc6UOMqR2CVAqui1SCgOaInJHACZ12Qheq8zlsuTzY8IOn3lhcw4AOOPT8xk9K dkUps02YfAbmVqkGWXyXoaoLVbYpOZhSKm9WvHtacbQd8pLBRY8Si0pBAHeJ9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717695697; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tDifyVSqFrBhfs2mUqETVqJ1fKiPt3Cnr0g8znrH+ug=; b=b+lh1zFJTxMINrmMqvBRrf2fNeUhY577DpBAoDiIFSdTcIqj6cwRQBp7rog1Bjtx8QTDKn 9Tnpjb8ficnjs9IjaxSLkngJnsC2Yw6/vQd0m6yPoF8DPOWdvZFLdWIXj8VtNUO5CGhJN4 e+EGrEP6MKsMFCaqTbL5sEg4ZBu1ytxXRBNg/c335of1GTMas6tXkZsjm/mvUVUeguuhPC Nt1fbUdl3Of5HHFQrHUkdcEj4QYcPAKFl/adZLiNGV9ZT6PKt2iT2vIrZvyD/0AGtQI6LU 1HqALm+qSzbLzdRCGdZ7PBOsuC8HHBy7C5SOMQV98D620271cBNiy0i+ArdRXQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VwBTY3lQJzvYp; Thu, 6 Jun 2024 17:41:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 456Hfb3g034712; Thu, 6 Jun 2024 17:41:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 456Hfb3B034709; Thu, 6 Jun 2024 17:41:37 GMT (envelope-from git) Date: Thu, 6 Jun 2024 17:41:37 GMT Message-Id: <202406061741.456Hfb3B034709@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Craig Leres Subject: git: 39a4ccbcc896 - main - net/ipsumdump: Unbreak amd64 build after 64825b9 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: leres X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 39a4ccbcc896b3e67f9c1ab9f65dea77959c3ec5 Auto-Submitted: auto-generated The branch main has been updated by leres: URL: https://cgit.FreeBSD.org/ports/commit/?id=39a4ccbcc896b3e67f9c1ab9f65dea77959c3ec5 commit 39a4ccbcc896b3e67f9c1ab9f65dea77959c3ec5 Author: Craig Leres AuthorDate: 2024-06-06 17:41:07 +0000 Commit: Craig Leres CommitDate: 2024-06-06 17:41:07 +0000 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. --- net/ipsumdump/Makefile | 2 +- net/ipsumdump/files/patch-src_aggtree.cc | 15 ++++++++------- net/ipsumdump/files/patch-src_aggwtree.cc | 15 ++++++++------- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/net/ipsumdump/Makefile b/net/ipsumdump/Makefile index 7cc3f2cb182c..73371d98fd91 100644 --- a/net/ipsumdump/Makefile +++ b/net/ipsumdump/Makefile @@ -1,6 +1,6 @@ PORTNAME= ipsumdump DISTVERSION= 1.86 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= https://read.seas.harvard.edu/~kohler/ipsumdump/ diff --git a/net/ipsumdump/files/patch-src_aggtree.cc b/net/ipsumdump/files/patch-src_aggtree.cc index dc49fccb44f5..1cbb8328fc40 100644 --- a/net/ipsumdump/files/patch-src_aggtree.cc +++ b/net/ipsumdump/files/patch-src_aggtree.cc @@ -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 --#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 diff --git a/net/ipsumdump/files/patch-src_aggwtree.cc b/net/ipsumdump/files/patch-src_aggwtree.cc index ad10f30c1ef9..18eb0e674202 100644 --- a/net/ipsumdump/files/patch-src_aggwtree.cc +++ b/net/ipsumdump/files/patch-src_aggwtree.cc @@ -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 --#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;