From nobody Fri Oct 27 06:35:34 2023 X-Original-To: dev-commits-ports-branches@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 4SGtFz1nTnz4xrXv; Fri, 27 Oct 2023 06:35:35 +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 4SGtFz1JWxz3Lxr; Fri, 27 Oct 2023 06:35:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698388535; 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=SRixAvKUcCtQInJ9Xc+QELLm0xqIzbjooYeFOYiGmp0=; b=Ph26F44xtFSVDc9aByWRF1s6EgBjbYaTD/wVgmnIxyxhICISXlhx9ki8b0LY/ZE4qOg4Na SCT7a8M1ZLJ4E1e8aAeHdaCF8fwm05bWhIV+UMjoCY71RBTZGQF6mW6tSlhWEcEJ2lE3cK HrxbJMg8jj5XuxQRGt0NaSJ77vMOqhASGsxpAtroAsJXlQnCdKgsFMcRkPVZqbPkblklD2 BV/5F7QTmYevUJiweiv2isNxNljJ5LzpH23r+2ZrTuf7oyMPmUH29Ngq7VV69dtAK4+AnI 3V9bEYdABfqJWgTBGaGL4uM+S3UISbpMgWRV8Qp3U/de68UG/m30aXRtA56YWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698388535; 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=SRixAvKUcCtQInJ9Xc+QELLm0xqIzbjooYeFOYiGmp0=; b=ytgWqBeqHuqJ5dctAqIMfYoWHfRozBsYCZ+IP7rYZtp994YB+q8k/2dzHpCNBakk0imVtE lxoNguQmP8neGUF6Q6+15+uq64Kz05ZJvqAecUUZ9fvK28xnBwmaaN4jG/sG7Q9DEmWSxX C3wfqa6jipFFK1qqVU/YtT13/HzvdOgxvxAuWpWVqVPtZd048HkZB6Mb9j/tPIMxwg85o6 ABG4REyT+gPUXGheMLRa+JxKkeRq8uxL0xhwhiQz8evaIl2guc10VW+1qKntDpBefM0V61 XOJDJySNYdckwZgXd/vXBwcXbJFddlWEnyZWyzQKD9Whx5eyAMIJ/2cjXDdOYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698388535; a=rsa-sha256; cv=none; b=Z3o3pgb3uLrKnJ2SeyQ3NpUNgtSXasvzJjroHd6J7ckuEM6wN6QVLOycdaV1SqWsKXfn4u DEfGF3KEQRE1ny0bFVekT6oq/tNfhzflp2Ht6ckN8T10Npq1iasW8R0tP0ibHTnelIQqwb G9JSHxN+YEfJ/eAlym2EXrMrDldYA8AQz8EpnCH1Mc7BgX0EFae1nW4KBhU2IMlZVPAG9f yKaFNIUSgC91cCcuAlY7Pgd0yvTGiieUWn3guql21t4SoQYjTTxGY5zfpNBXoh9RdFc5WO evk3CZuOeGxQotsOAwS3kufXjcD2mt+W/VH241CCbAD2qqkBl8g3R71IE3chnw== 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 4SGtFz0GsCz131B; Fri, 27 Oct 2023 06:35:35 +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 39R6ZYUF090944; Fri, 27 Oct 2023 06:35:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39R6ZYAj090941; Fri, 27 Oct 2023 06:35:34 GMT (envelope-from git) Date: Fri, 27 Oct 2023 06:35:34 GMT Message-Id: <202310270635.39R6ZYAj090941@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Clausecker Subject: git: 906ef9acf9b9 - 2023Q4 - devel/quickcpplib: fix on 32 bit platforms List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2023Q4 X-Git-Reftype: branch X-Git-Commit: 906ef9acf9b9578cfab90e69b5da610a06ea305d Auto-Submitted: auto-generated The branch 2023Q4 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=906ef9acf9b9578cfab90e69b5da610a06ea305d commit 906ef9acf9b9578cfab90e69b5da610a06ea305d Author: Robert Clausecker AuthorDate: 2023-10-24 05:10:22 +0000 Commit: Robert Clausecker CommitDate: 2023-10-27 06:35:09 +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 (cherry picked from commit 7e25442cf7355486041ebb30c77a7c815aa3e701) --- 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