From nobody Fri Oct 27 06:34:06 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 4SGtDG3LWxz4xrSB; Fri, 27 Oct 2023 06:34:06 +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 4SGtDG2kF0z3KsD; Fri, 27 Oct 2023 06:34:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698388446; 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=b+Ztl12pUqK5fwJzD+VotIpwf3KhCt57FtiaUK75FJU=; b=UxrmosTbFeF7ZEBbujPJlcAcgOfyTLJGfG8Zbn80ICS7IKM3JJr0Z5KPSx28qsuVN19mYR ruI11jxM8ymNoTrXpU/nZXBv+qg2apWUIayTqyVvQYElayIRNn5Pt3YlkIPunPZ5mXYsbP fGxtOXd+SZLPr8hDIcfm0ARm4GADdyDsWRwCVahcbv3epT6fp0aTGC2dbjB5XxvHrd0up5 NI61ppUouMtl6N0tfGQdyDCJdfRLW0Ee8Yywhw2PvIqSQm9e8VlpbCQLsBY48/Zgo8iX/e ANNda/R7hKDt506uiEzf34p25O1MKxg5DejzTWf4fA2ZskKXHy/UJL2pJJnnaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698388446; 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=b+Ztl12pUqK5fwJzD+VotIpwf3KhCt57FtiaUK75FJU=; b=M+e56P5DNowXjy1G6spvWZCrD/y5yTtA/D6q9VwRCrHYJ670IjZuQ1Fiz2/ZmU5Y0cfDP5 b4y2Xjc3zTvrM9iHwSxCB7PIM4xJu88Sd2kZ8/UPvWlwCvKhqzNXZ6Zfate9cO8gj/vFE/ C641ZTL3s/hJL4IDHTkdM84BcgrQE6WJ3XvE5g7gsKwh8NYq/hRE/mwAirXKyOX7FDxpJD 6XOqKxOQk4B+G0FbGpA+F4t4u1qJ835BUwuSF/d/sry4uUf4yA/MulOFRVYsB1uRaxwwn+ Us0OYirEe0zeNYXShE2dFH1+brorZX5Ci6AdjSBZXedS7Ql76dngx5/ZE2Ugdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698388446; a=rsa-sha256; cv=none; b=CMUzOb+Wopvwc1HFuzRZM3nQq6B9sBqlrmmjrhTMzp8g6Esv4aCNRvnb2uXsmuSAAYwtc0 ZCIJ83mSANc6neONBUVNKywH6/Y1wWB9hbTnxaD2ruowiux7YMt05UhzquIdDI0Kt2F8Xi JXdHur3Fhg+vxRVM7+UBBUpKj4y/MIkdi1F/0S4CQh+Wb7b/DOnxR/irypzgQWX3o6TSJH dh0cP3/3ddSd3BvEPSNAjTJWptSAbzJ3e6WN+yX7+30LtW/mGsGLA0C/dlA/s+qxzn0Hwz boJFEvVpRmoYreTbTblg/s1w4GyWVCBdpdMQ7plHK3D39JfTQsCfm6mC0fvW3Q== 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 4SGtDG1q0Zz137k; Fri, 27 Oct 2023 06:34:06 +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 39R6Y6Ke089806; Fri, 27 Oct 2023 06:34:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39R6Y6vC089803; Fri, 27 Oct 2023 06:34:06 GMT (envelope-from git) Date: Fri, 27 Oct 2023 06:34:06 GMT Message-Id: <202310270634.39R6Y6vC089803@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 7e25442cf735 - main - devel/quickcpplib: fix on 32 bit platforms 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: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7e25442cf7355486041ebb30c77a7c815aa3e701 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=7e25442cf7355486041ebb30c77a7c815aa3e701 commit 7e25442cf7355486041ebb30c77a7c815aa3e701 Author: Robert Clausecker AuthorDate: 2023-10-24 05:10:22 +0000 Commit: Robert Clausecker CommitDate: 2023-10-27 06:32:58 +0000 devel/quickcpplib: fix on 32 bit platforms 128 bit integers are only supported on 64 bit platforms. Test for them using the correct feature test macro to enable the port there. Approved by: portmgr (build fix blanket) MFH: 2023Q4 See also: https://github.com/ned14/quickcpplib/issues/50 --- devel/quickcpplib/Makefile | 3 +- .../files/patch-include_quickcpplib_uint128.hpp | 65 ++++++++++++++++++++++ 2 files changed, 66 insertions(+), 2 deletions(-) diff --git a/devel/quickcpplib/Makefile b/devel/quickcpplib/Makefile index d729a65f7ea2..be416b9a4fdd 100644 --- a/devel/quickcpplib/Makefile +++ b/devel/quickcpplib/Makefile @@ -1,5 +1,6 @@ PORTNAME= quickcpplib DISTVERSION= g20230614 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org @@ -9,8 +10,6 @@ WWW= https://github.com/ned14/quickcpplib LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/Licence.txt -BROKEN_i386= complation fails: __int128 is not supported on this target - USES= cmake:testing USE_GITHUB= yes diff --git a/devel/quickcpplib/files/patch-include_quickcpplib_uint128.hpp b/devel/quickcpplib/files/patch-include_quickcpplib_uint128.hpp new file mode 100644 index 000000000000..42004d9b622d --- /dev/null +++ b/devel/quickcpplib/files/patch-include_quickcpplib_uint128.hpp @@ -0,0 +1,65 @@ +--- include/quickcpplib/uint128.hpp.orig 2023-10-24 05:06:15 UTC ++++ include/quickcpplib/uint128.hpp +@@ -53,7 +53,7 @@ namespace integers128 + #if defined(__SSE2__) || defined(_M_X64) || (defined(_M_IX86_FP) && _M_IX86_FP >= 2) + __m128i as_m128i; + #endif +-#if defined(__GNUC__) || defined(__clang__) ++#if defined(__SIZEOF_INT128__) + unsigned __int128 as_uint128; + #endif + //! Default constructor, no bits set +@@ -100,7 +100,7 @@ namespace integers128 + } + uint128 operator+=(const uint128 &v) noexcept + { +-#if defined(__GNUC__) || defined(__clang__) ++#if defined(__SIZEOF_INT128__) + as_uint128 += v.as_uint128; + return *this; + #endif +@@ -118,7 +118,7 @@ namespace integers128 + } + uint128 operator-=(const uint128 &v) noexcept + { +-#if defined(__GNUC__) || defined(__clang__) ++#if defined(__SIZEOF_INT128__) + as_uint128 -= v.as_uint128; + return *this; + #endif +@@ -146,7 +146,7 @@ namespace integers128 + { + if(!b) + throw std::domain_error("divide by zero"); +-#if defined(__GNUC__) || defined(__clang__) ++#if defined(__SIZEOF_INT128__) + as_uint128 %= b.as_uint128; + return *this; + #endif +@@ -169,7 +169,7 @@ namespace integers128 + { + if(!b) + throw std::domain_error("divide by zero"); +-#if defined(__GNUC__) || defined(__clang__) ++#if defined(__SIZEOF_INT128__) + as_uint128 %= b; + return *this; + #endif +@@ -215,7 +215,7 @@ namespace integers128 + } + uint128 operator<<=(uint8_t v) noexcept + { +-#if defined(__GNUC__) || defined(__clang__) ++#if defined(__SIZEOF_INT128__) + as_uint128 <<= v; + return *this; + #endif +@@ -232,7 +232,7 @@ namespace integers128 + } + uint128 operator>>=(uint8_t v) noexcept + { +-#if defined(__GNUC__) || defined(__clang__) ++#if defined(__SIZEOF_INT128__) + as_uint128 >>= v; + return *this; + #endif