From nobody Sat Jan 6 19:45:32 2024 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 4T6rQj1Dfnz573Ty; Sat, 6 Jan 2024 19:45:33 +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 4T6rQj0Zrjz43Bt; Sat, 6 Jan 2024 19:45:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704570333; 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=YvURtkQGARn59cKIh6jTbGjlS1eYKmbkkVm2diyCJe8=; b=IFF2UminLIrX0nYw2eki4U7Fpphh9P8U7VMTsKGO5XvBMqq14lonzv0U7NLMey63NdFNfm JwIQKUPBoHZT7hXdPlE9aT/7397O3rnl5qLerDWTFAbAHtJCy1OijGfFL6SGPo5wFx2CQw 6D7mRp2ccbYlCpCeqxSawnxElKOzyawLA2HYwKlB5QCl8miHHCu88uSvCc/25MFL7e77Aa 5OX3etHDeQYfk23QE3kJSayiKclIJzVVYBNkaspB3MID/TuJT0yamgloDkIL4V5VpSNSiE Xt1xRG4X/mdb0yTNzL9ySP4ykU+ZRIY+SpQLBo8Gd8w3TDPRzmCrwWVBBXyHwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704570333; 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=YvURtkQGARn59cKIh6jTbGjlS1eYKmbkkVm2diyCJe8=; b=W494qCxQL375s79slLfMESiVv0MxLObZSxFu8CEr+6hNBnxABW7j2ESsv/4fI8D2Fp6wuC ze4UP6qDvTJn65p5IChH0nl2vn+S7UIBLvF/t2OjiludeuW0hEv/UNiH4Oou80LOaahQXi hNWImrgu1S+I9VUsGmTm01gN3NglGA1JF4SXrSC9L/Vhrypiun5f7d9yQl5pWaSrT4gjJF +2c34IhCLCCHTlWYexGHGaXr8TIblv1KxROkQP1jWbXDOZJvFCb3q2YH8Al0Y1xjdiy0Hv cf5M2s0ZbghtpkGqur5NYrEDnB4LrtTh9ZPw+EGsyu2nnLFzc4KQFavQYAvuGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704570333; a=rsa-sha256; cv=none; b=Yb0xQWfIb/e4+PgjqEpQt+gyQok5A3hf/K/UNmE13THfkFlr9DWiPowWXeUCwVSyeO3tkx ivLutVcMB3Xb65mHPy4Ip4H0y7L6kMIrk4WCTCrPWIqLDumUbaBo88OAPAyO/ThdGljdBm 0MZTov1a5pwZobxrNpGVC7lAiimv9kbkDIIF71ztO+G4jbBZUY2ICqeAqBQgL8MnTt2HBM FMjoGtKjG+yUIjitQlYY6+dAHS3WEfaDnVpq81Rima0BQvKAblDZDYE6R+fmveEXDjeeVm CUDHFYoOMu9cR1sU0xxSmGn2rTBi0Eld+GxWN/dYEP9VERG/rqjR01BAVLjIVQ== 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 4T6rQh6mH3zvKj; Sat, 6 Jan 2024 19:45:32 +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 406JjWA7098805; Sat, 6 Jan 2024 19:45:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 406JjW2X098802; Sat, 6 Jan 2024 19:45:32 GMT (envelope-from git) Date: Sat, 6 Jan 2024 19:45:32 GMT Message-Id: <202401061945.406JjW2X098802@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ryan Steinmetz Subject: git: 2af16d130db4 - main - net/mosh: Fix build with clang 18 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: zi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2af16d130db46aeb4a579c27715fa82ad9562a69 Auto-Submitted: auto-generated The branch main has been updated by zi: URL: https://cgit.FreeBSD.org/ports/commit/?id=2af16d130db46aeb4a579c27715fa82ad9562a69 commit 2af16d130db46aeb4a579c27715fa82ad9562a69 Author: Ryan Steinmetz AuthorDate: 2024-01-06 19:43:06 +0000 Commit: Ryan Steinmetz CommitDate: 2024-01-06 19:45:20 +0000 net/mosh: Fix build with clang 18 PR: 276159 Submitted by: dim@ --- net/mosh/Makefile | 3 ++- net/mosh/files/patch-src_crypto_ocb__internal.cc | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/net/mosh/Makefile b/net/mosh/Makefile index cf60bdf74200..791b2c4e16b2 100644 --- a/net/mosh/Makefile +++ b/net/mosh/Makefile @@ -17,7 +17,8 @@ USE_PERL5= run GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-utempter --without-ncurses CONFIGURE_ENV+= OpenSSL_CFLAGS="-I${OPENSSLINC}" OpenSSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" \ - TINFO_CFLAGS="-I/usr/include" ac_cv_have_decl_bswap64=yes + TINFO_CFLAGS="-I/usr/include" ac_cv_have_decl_bswap64=yes \ + ac_cv_have_decl___builtin_bswap64=yes INSTALL_TARGET= install-strip USE_CXXSTD= c++17 diff --git a/net/mosh/files/patch-src_crypto_ocb__internal.cc b/net/mosh/files/patch-src_crypto_ocb__internal.cc new file mode 100644 index 000000000000..fed2ca4292e3 --- /dev/null +++ b/net/mosh/files/patch-src_crypto_ocb__internal.cc @@ -0,0 +1,15 @@ +--- src/crypto/ocb_internal.cc.orig 2022-10-27 01:18:11 UTC ++++ src/crypto/ocb_internal.cc +@@ -130,10 +130,10 @@ + + #if _MSC_VER + #define bswap64(x) _byteswap_uint64(x) +-#elif HAVE_DECL_BSWAP64 +- /* nothing */ + #elif HAVE_DECL___BUILTIN_BSWAP64 + #define bswap64(x) __builtin_bswap64(x) /* GCC 4.3+ */ ++#elif HAVE_DECL_BSWAP64 ++ /* nothing */ + #else + #define bswap32(x) \ + ((((x) & 0xff000000u) >> 24) | (((x) & 0x00ff0000u) >> 8) | \