From nobody Sun Feb 19 10:14:44 2023 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 4PKLyD4kd0z3kh96; Sun, 19 Feb 2023 10:14:44 +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 4PKLyD499xz430S; Sun, 19 Feb 2023 10:14:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676801684; 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=20K3FEepGBr4IwkerBU72DTRqGz1cmlo6IlFYBcNBkI=; b=IBOgjC6WcLzuRyx/FhVwAvFC5nKmMn17fNr0gV6hs41L2nLC0xgWnC3EjDJTnQN373mDTR MCDBY2AeE59z7BglmDwHLO2+qM0AlZ9mzmVOz96vRSYfV+0Cliw06aSwRreSNPixQfspCa aab3Lskf9QA6nJwCji6hpCUt35Bi30QINU0ndGBMW+fRERNOjct78uz6VQsjKRg7MxGlfl ZTucuxiB3OnRARcSDGsg0eB/harL3+B/YK0GlD2xq0vsFZy4BlkHC7XRfe7I2NP5Ai1mqo KfUjt0bGzR3jgKiDq3roqRDEMn1UwZl2c4YZFcU1QEzoabs3XRWl4hPqwCBPWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676801684; 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=20K3FEepGBr4IwkerBU72DTRqGz1cmlo6IlFYBcNBkI=; b=KRo1DgcIv1bolpob3NH+gcutoAzaxJRGsyFRskY2ou/F/8DhBak1OcgDcjj2iY9SwO6QYQ EZoOL0W/btC5+IvObL8ufGgxISmQaJtlw/y6VpunJ3HyhtZhfDajY27lt83YwvqLq/un2K /FluiJnPeIgrAw+tcEWsJLetWF2MxpOJvq592ub+XVbA+PHq06n8kaz77M2o8eBgRDiY6N l9chqt3tqGIk8JL3JmWLzWSmPoSQjfnTphT/zAFxr3uX8dTGdW9fFLJllijOAJAGAULREb iFkgCw2iXKvmvubdIo/caX0NpIA4NIkZTezAG3aNr3KR16gg0OlFW2lSyQMNWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676801684; a=rsa-sha256; cv=none; b=Oue5Jg5vleoRXGgmyFm0J3K+C3kABpBB0Cv6tiqsKeOL6p3HR4fgs1NZWWXxkNDKC9ubkY 4VbweQnnYfyGtJTao/+sPsup7xyRzOAc3/OOksdC6bfHolzx4CnwjOknBRqba0wLkaYkcH 3HdexRvaZbAZMrMwjNdW7znHMnBNw6smg7eI9lYu7mz6I0Lj9bZ9WO9Bwn2khBE2E59g7G FPttvxUY/eKbm6RyxsyOLoCIvZPjCOtwIG6LfITqI+nEEkaYpMa8g29naRAdsmFDL2xpF2 lDElHs6BDIyUZQNcZx45FphBWhhVk/5bpvARMMzoXtrMx+FkM/Nvk7scaEhafg== 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 4PKLyD3D3SzyN9; Sun, 19 Feb 2023 10:14:44 +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 31JAEiYS081319; Sun, 19 Feb 2023 10:14:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31JAEiPt081318; Sun, 19 Feb 2023 10:14:44 GMT (envelope-from git) Date: Sun, 19 Feb 2023 10:14:44 GMT Message-Id: <202302191014.31JAEiPt081318@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Emanuel Haupt Subject: git: 4cfb25743893 - main - net-p2p/xmrig: Fix build with clang15 on i386 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ehaupt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4cfb25743893e2abc3c9cda87e2e720f420c39f1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ehaupt: URL: https://cgit.FreeBSD.org/ports/commit/?id=4cfb25743893e2abc3c9cda87e2e720f420c39f1 commit 4cfb25743893e2abc3c9cda87e2e720f420c39f1 Author: Emanuel Haupt AuthorDate: 2023-02-19 10:14:16 +0000 Commit: Emanuel Haupt CommitDate: 2023-02-19 10:14:39 +0000 net-p2p/xmrig: Fix build with clang15 on i386 Upstream issue: https://github.com/xmrig/xmrig/issues/3212 --- net-p2p/xmrig/Makefile | 2 -- net-p2p/xmrig/files/patch-src_crypto_cn_CryptoNight__x86.h | 11 +++++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/net-p2p/xmrig/Makefile b/net-p2p/xmrig/Makefile index 4867f6c7b049..330693d4674d 100644 --- a/net-p2p/xmrig/Makefile +++ b/net-p2p/xmrig/Makefile @@ -12,8 +12,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_powerpc64= fails to compile: g++9: error: unrecognized command line option '-maes'; did you mean '-mads'? BROKEN_riscv64= fails to compile: /nxb-bin/usr/lib/clang/11.0.0/include/cpuid.h:11:2: error: this header is for x86 only -# See: https://github.com/xmrig/xmrig/issues/3212 -BROKEN_FreeBSD_14_i386= fails to compile with llvm15 on i386 USES= cmake compiler:c++11-lang ssl USE_GITHUB= yes diff --git a/net-p2p/xmrig/files/patch-src_crypto_cn_CryptoNight__x86.h b/net-p2p/xmrig/files/patch-src_crypto_cn_CryptoNight__x86.h new file mode 100644 index 000000000000..97b199971b98 --- /dev/null +++ b/net-p2p/xmrig/files/patch-src_crypto_cn_CryptoNight__x86.h @@ -0,0 +1,11 @@ +--- src/crypto/cn/CryptoNight_x86.h.orig 2023-02-02 04:51:11 UTC ++++ src/crypto/cn/CryptoNight_x86.h +@@ -80,7 +80,7 @@ static inline void do_skein_hash(const uint8_t *input, + void (* const extra_hashes[4])(const uint8_t *, size_t, uint8_t *) = {do_blake_hash, do_groestl_hash, do_jh_hash, do_skein_hash}; + + +-#if defined(__i386__) || defined(_M_IX86) ++#if (defined(__i386__) || defined(_M_IX86)) && !(defined(__clang__) && defined(__clang_major__) && (__clang_major__ >= 15)) + static inline int64_t _mm_cvtsi128_si64(__m128i a) + { + return ((uint64_t)(uint32_t)_mm_cvtsi128_si32(a) | ((uint64_t)(uint32_t)_mm_cvtsi128_si32(_mm_srli_si128(a, 4)) << 32));