From nobody Fri Oct 27 06:35:38 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 4SGtG26WLkz4xrkk; Fri, 27 Oct 2023 06:35:38 +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 4SGtG24BQ4z3M8y; Fri, 27 Oct 2023 06:35:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698388538; 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=B0orNwJ3M24Clh7W3wTnRqBv+8ddruQn39fJ6zvssEQ=; b=oNP2zxhklsoKbNc44vkwTg6ITayXtFXQCc1xyYYUuQ7hlcosEPsF3TTa2abFdb3TaWQkyM aqFeTNt4VivKiUg9ohZW8vSHuZgAcNadcgHJVT22P5IWXqoikCSYlnxIQx1I97O6eN88Sx 7chZXipmgSP+cYzoT7nn2WSebflaoVMOMSpimMgrrC11+I3ARXPgri5Cn83BZSrWMnD1Ec /LslDzDUs4GhZu7/0FAVk84uBsHHLFMaZRYnXg+lAZWCfoIsF+Ve7dWaHn1x7FDXhX4HwE 8BK0tv/CElC9glC0raD1uoK1qRABz+haG+v1QQGkedyGwTqE3sihUhyVZs2flQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698388538; 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=B0orNwJ3M24Clh7W3wTnRqBv+8ddruQn39fJ6zvssEQ=; b=DpPBR5rWTC5ISVfDJo19BUhiH27HI3yXDOG6zar8vUZdtRCkRGkTsMR3sqsyOzK5GxJim8 OTYUlOb8q2GlXeqwAC6aCXFdkJnDzdzk95vMPQDFSEpSW8/XfIPgm7HvCM9PLXbYrdPLAt SRgmO5ZxjxdBiVwBKaTBFS9aXNhQrY3aqZegRaYVW7e8SG+lizsLTylFAntDlbdijHXFQG kzFlRafiMTcJFw8ZGSrTnaP/c8wxrcwypSrJrDolfsnVBBoOak3SLstzFjI/mvkn9A+VDc cgJxdoHKmir7VaIK5XbIkENIg0YEoAWDLhuMvWZeTuKshjntAPsAlc3QRLXVkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698388538; a=rsa-sha256; cv=none; b=skBEDcX3g0Gwu+uZAnmTDS/RJH9KScS49cdOR0qoq6cdQ7BVYC3GTiIdl2YVrK2O+H1aGv juZdwDcgv8py5WEvQqINRbEVvh+MDcj0Rn+TsVMxB/rPD608ACc458/kVB0u6ByA29bTCR O09vm85o78CiXEDsvKEcXBQ1d4pFCyDtBt9KFJDxdfkxGNKRC7POAIvUjz6c8TE9wFg0jZ UutHAzBNf0mnoQGiCixjdm5COzQiPG9AB3M3c587RsIL1e8HWno91DatXMuCVkhgRmQo0k +EDw8ptBVmL7ouu4HszSOijXmwxtuW1aBPM1wg6iLudQoN3G8e2TeYXIcP6udg== 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 4SGtG23B94z13WM; Fri, 27 Oct 2023 06:35:38 +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 39R6ZcRO091082; Fri, 27 Oct 2023 06:35:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39R6ZcuW091079; Fri, 27 Oct 2023 06:35:38 GMT (envelope-from git) Date: Fri, 27 Oct 2023 06:35:38 GMT Message-Id: <202310270635.39R6ZcuW091079@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: 2542a932b23c - 2023Q4 - devel/libqsbr: fix build 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: 2542a932b23c395b8cd1fb5f6064354de6b8796c Auto-Submitted: auto-generated The branch 2023Q4 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=2542a932b23c395b8cd1fb5f6064354de6b8796c commit 2542a932b23c395b8cd1fb5f6064354de6b8796c Author: Robert Clausecker AuthorDate: 2023-10-25 22:43:17 +0000 Commit: Robert Clausecker CommitDate: 2023-10-27 06:35:10 +0000 devel/libqsbr: fix build on 32 bit platforms The fix is to make qsbr_epoch_t a 64 bit integer in any case. The fix is carefully designed not to change the API on platforms where it is so already. Unfortunately this fix requires FreeBSD 13 or newer due to the old LLVM version included in FreeBSD 12. While we are at it, hook up test target. See also: https://github.com/rmind/libqsbr/issues/12 Approved by: portmgr (build fix blanket) MFH: 2023Q4 (cherry picked from commit f4fd4422b1dd218d268a9fda267ca39596ce53d8) --- devel/libqsbr/Makefile | 9 +++++++-- devel/libqsbr/files/patch-qsbr.h | 14 ++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/devel/libqsbr/Makefile b/devel/libqsbr/Makefile index 205d04fe1d1e..a864a3acbe22 100644 --- a/devel/libqsbr/Makefile +++ b/devel/libqsbr/Makefile @@ -9,8 +9,12 @@ WWW= https://github.com/rmind/libqsbr LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/../LICENSE -BROKEN_i386= static_assert(sizeof(qsbr_epoch_t) == 8, "expected 64-bit counter") -BROKEN_powerpc= static_assert(sizeof(qsbr_epoch_t) == 8, "expected 64-bit counter") +# the fix uses __LONG_WIDTH__ which is only available from FreeBSD 13 +BROKEN_FreeBSD_12_i386= static_assert(sizeof(qsbr_epoch_t) == 8, "expected 64-bit counter") +BROKEN_FreeBSD_12_armv6= static_assert(sizeof(qsbr_epoch_t) == 8, "expected 64-bit counter") +BROKEN_FreeBSD_12_armv7= static_assert(sizeof(qsbr_epoch_t) == 8, "expected 64-bit counter") +BROKEN_FreeBSD_12_powerpc= static_assert(sizeof(qsbr_epoch_t) == 8, "expected 64-bit counter") +BROKEN_FreeBSD_12_mips= static_assert(sizeof(qsbr_epoch_t) == 8, "expected 64-bit counter") USES= compiler:c11 gmake libtool:build USE_GITHUB= yes @@ -22,5 +26,6 @@ MAKE_ENV= DESTDIR=${STAGEDIR}${PREFIX} \ INCDIR=${LOCALBASE}/include \ LIBDIR=${LOCALBASE}/lib \ MANDIR=${LOCALBASE}/man +TEST_TARGET= tests .include diff --git a/devel/libqsbr/files/patch-qsbr.h b/devel/libqsbr/files/patch-qsbr.h new file mode 100644 index 000000000000..3a6f9d505741 --- /dev/null +++ b/devel/libqsbr/files/patch-qsbr.h @@ -0,0 +1,14 @@ +--- qsbr.h.orig 2023-10-25 22:40:12 UTC ++++ qsbr.h +@@ -13,7 +13,11 @@ + + struct qsbr; + typedef struct qsbr qsbr_t; ++#if defined(__LONG_WIDTH__) && __LONG_WIDTH < 64 ++typedef unsigned long long qsbr_epoch_t; ++#else + typedef unsigned long qsbr_epoch_t; ++#endif + + __BEGIN_DECLS +