From nobody Mon Feb 21 11:32:41 2022 X-Original-To: dev-commits-ports-main@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 DCAF219D26A7; Mon, 21 Feb 2022 11:32:41 +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 4K2Ksj5Y5fz4s33; Mon, 21 Feb 2022 11:32:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645443161; 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=RRn2l/rB8Jw/3bHZLB6uKF03Vxad33bdCRrxofJYgtw=; b=BZiNUQ8tFft4j5Pda1Eli+mNRpZet9pbJNgLK0XUWqy2+3eQtsETtmN6v09rc0hfNn3r/P LlxXr9jY7s58ejk7j8LIQr63WNqg13hufjXz6NHngx6MR2fQBBgBe7V7JoNJLJGtsw7VYb 1Urkn1j9BQwUeWfLyT1cn2ZW7ll3N3dYIyd7NdVTRzNm/XxPCeE82oYgFFzAcpgS/uFU/3 BEtEGy0SDLUNsbhEWrY/D996u96uJVvwjEEgGJiMoB08RU1yl8Xr6GPSxPW+8j9to+e7tn f/mMzQMvqswBkVaQI21TDY28th+i3WLmeb8M8HgbLgZnGZs6YYLDRjOVF/Z9Uw== 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 6DB5C76C1; Mon, 21 Feb 2022 11:32:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21LBWfT3017721; Mon, 21 Feb 2022 11:32:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21LBWfv4017720; Mon, 21 Feb 2022 11:32:41 GMT (envelope-from git) Date: Mon, 21 Feb 2022 11:32:41 GMT Message-Id: <202202211132.21LBWfv4017720@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 2988f607eda5 - main - textproc/randlm: fix build on powerpc* List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2988f607eda5bb18408318bb5a5e3a2d5917ea31 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645443161; 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=RRn2l/rB8Jw/3bHZLB6uKF03Vxad33bdCRrxofJYgtw=; b=PjNsEmF24lR6GTAXPaWwR5R0x3QYWIckUJTH4fTRk7c6T+KrV2Z4CK5Om8q+M6AIy6NxER lHJre47EWsA227UUZ78kyHfWNro+qVNzuOrAAcNJvtl2tCIprBGD53eD50hzXBxvTHh9Lx hAOl3ZzlYmRtEgkKDKg9riNrytTZzwJBb7dD8ZRtNBtH6FILNMArDT3ME5GVnSrXoan22l YIdXT1ndc9PanFGQsg6kcWq4Hrn8pT1y0PFQ4OIkF8x6SiBmSPLMtSnPnNMw0bxVR39jGG 2Thh2sZdLsT9g/EJ33ybR/8G/HmxY7Nh+ntG+cysUOaDA9dbmKKVYmyN+YWC8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645443161; a=rsa-sha256; cv=none; b=Wn2uESogVtMNn514BatrAwbArc1YweAUuEkbFk+biN85IKAhdoszGHdruNQ7N9LjQYbiSR nHXGQErNlrXrw6UlM0WCwOkj/TkXQy8H+KTDS5ETcr+w04PCrNMN0EZbnmOwocyMTQ4sKp Pxm/b1gOeKwkPFUPgObqzTCJZXNGrkUrDX4t23fMAZ06fu5egSbr+A2CvhmiA4+U9NFgqw wHi/RKTaTkH0ZXs5MdShZYbxopdOQY8aOwzRsxrEo75VKdqp0uHFJSWbB2mzfVqh48x8ib pASY0rLMnqB9d34wB22AK99U3X93N1yW+8AGOrrYyGt+qKA2jVrvlr6W5dkwig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=2988f607eda5bb18408318bb5a5e3a2d5917ea31 commit 2988f607eda5bb18408318bb5a5e3a2d5917ea31 Author: Piotr Kubaj AuthorDate: 2022-02-21 11:30:36 +0000 Commit: Piotr Kubaj CommitDate: 2022-02-21 11:30:36 +0000 textproc/randlm: fix build on powerpc* rdtsc() is available only on amd64 / i386. --- textproc/randlm/Makefile | 1 - textproc/randlm/files/patch-src-LDHT-Util.h | 22 ++++++++++++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/textproc/randlm/Makefile b/textproc/randlm/Makefile index 08a7c11132fd..31849bcfbbbe 100644 --- a/textproc/randlm/Makefile +++ b/textproc/randlm/Makefile @@ -14,7 +14,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING BROKEN_aarch64= fails to compile: invalid output constraint =a in assembler BROKEN_armv6= fails to compile: invalid output constraint =a in assembler -BROKEN_powerpc64= fails to compile: 'itr' does not name a type BROKEN_riscv64= fails to compile: invalid output constraint =a in assembler BUILD_DEPENDS= ${LOCALBASE}/include/google/sparse_hash_map:devel/sparsehash diff --git a/textproc/randlm/files/patch-src-LDHT-Util.h b/textproc/randlm/files/patch-src-LDHT-Util.h index 4d03aae6710f..c3eb320265ef 100644 --- a/textproc/randlm/files/patch-src-LDHT-Util.h +++ b/textproc/randlm/files/patch-src-LDHT-Util.h @@ -1,5 +1,5 @@ ---- src/LDHT/Util.h.orig 2012-03-30 14:53:05.000000000 +0400 -+++ src/LDHT/Util.h 2014-08-30 18:08:50.000000000 +0400 +--- src/LDHT/Util.h.orig 2012-03-30 10:53:05 UTC ++++ src/LDHT/Util.h @@ -10,6 +10,10 @@ #include #include @@ -11,3 +11,21 @@ #define V(expr) std::cerr << __FILE__ << ":" \ << __LINE__ << " " \ +@@ -43,6 +47,9 @@ class Util { (public) + static uint64_t hash(uint64_t a, uint64_t b, uint64_t P, uint8_t* e); + static uint64_t hash(uint64_t a, uint64_t b, uint64_t P, uint64_t e); + static inline uint64_t rdtsc() { ++#if defined(__powerpc__) ++ return __builtin_readcyclecounter(); ++#else + uint32_t lo, hi; + __asm__ __volatile__( + "xorl %%eax,%%eax\n" +@@ -52,6 +59,7 @@ class Util { (public) + : + : "%ebx", "%ecx"); + return static_cast(hi) << 32 | lo; ++#endif + }; + }; +