From nobody Fri Oct 27 06:34:17 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 4SGtDV1cDQz4xrST; Fri, 27 Oct 2023 06:34:18 +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 4SGtDT5X9Jz3LR5; Fri, 27 Oct 2023 06:34:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698388457; 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=HhFZ3EYTNHeKXnaDP9Zu0hhD6yKans8YTa7YUWnyAIM=; b=gYnI6yXLW1hK4v1noWkZMRVeiUdfkXkYfrMqxHzLNzQwUfKMz/LBoNNCYf+GVahi7CpVQI oWHGO6J+Db0LjIIMJm/dqeJILsmY699eYdpGXl0z9KU38fAB385eczRVa5i3Wg+W7hKqio xn9FrRn0rdCjOZ3IGmw25/AvgFGagxRTvUtmIFFw81O2JSG9X34UYauDVrrBEnD6Lb23RB /kEglPZEWsMF6RkaqqtsXGebVe4twV8x13oAA4gD7W4ic1ag0z0jAyzMLpqZRhj3DGmCg7 +xrMzOJ5SZHswwAPMmka/8BmdVCSLPRb14+wU9eZpEZ0i+aCT5dc6cn+y2Scyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698388457; 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=HhFZ3EYTNHeKXnaDP9Zu0hhD6yKans8YTa7YUWnyAIM=; b=judWqH7xrm4KSz6uGCthscol+CYmlGCxhbltsYuLwbOLFTG8wQRUHmMk9qjyKDtaBDcVwr iyki4s9wPL7Vhe392Q4OqEdorRdCurABRAu+qrEKWBWGTFOO39MYIfAUoVtbq21WIW8n6Y HwukVo504U4fd3tcTZdz3t+Vz5dRXt4SFS5nxCGri/u7W8oPmW2MEBfuHZbB6YFdwaWpDc NG12PXeoLPTxcx9nYtsBdTYR1wYlEsfSXzB750qHITj12CAXuJtCDtlcooYsmtFfjOOWMK TXu0rAICNwW66c9qp2AaP0qqK1Voan/GLMmGqDkxlBwZcHrY6HWAoWtZzYpJXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698388457; a=rsa-sha256; cv=none; b=NP8TQZcqq05R8ZErqbB4V38oPQF0il8nYwehHiZdXU3M/ROLXLwZh58O8stOu6Grzx5OVI YtqdZ3ZTXN/gNFXgtjPifMjJTYURFAhf0ee17XoOHK9KJMRjBChvU2cJxWgkl+ovc/CNJi F38gWG3LySfmYeZgxQwsMjmdYjbTe4s1csl+Cum6USPxmCVfHhQlXpjp10bcbMGWcujvl8 5YVpvgp53ukszDvCtW3qTx31udTFEuQ+TGzageddr8sQuBDlHHo/Vx88UxB2cxQCL5doA4 TR2aRV197yqW7DA0Tm5Cfj++TNNKrxt/MsDQlEfkq3CL4wK1bxKoennVQzH7LA== 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 4SGtDT4dMdz12Yv; Fri, 27 Oct 2023 06:34:17 +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 39R6YHOE090244; Fri, 27 Oct 2023 06:34:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39R6YHde090241; Fri, 27 Oct 2023 06:34:17 GMT (envelope-from git) Date: Fri, 27 Oct 2023 06:34:17 GMT Message-Id: <202310270634.39R6YHde090241@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: f4fd4422b1dd - main - devel/libqsbr: fix build 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: f4fd4422b1dd218d268a9fda267ca39596ce53d8 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=f4fd4422b1dd218d268a9fda267ca39596ce53d8 commit f4fd4422b1dd218d268a9fda267ca39596ce53d8 Author: Robert Clausecker AuthorDate: 2023-10-25 22:43:17 +0000 Commit: Robert Clausecker CommitDate: 2023-10-27 06:33:00 +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 --- 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 +