Date: Sat, 6 Jan 2024 19:45:32 GMT From: Ryan Steinmetz <zi@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 2af16d130db4 - main - net/mosh: Fix build with clang 18 Message-ID: <202401061945.406JjW2X098802@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by zi: URL: https://cgit.FreeBSD.org/ports/commit/?id=2af16d130db46aeb4a579c27715fa82ad9562a69 commit 2af16d130db46aeb4a579c27715fa82ad9562a69 Author: Ryan Steinmetz <zi@FreeBSD.org> AuthorDate: 2024-01-06 19:43:06 +0000 Commit: Ryan Steinmetz <zi@FreeBSD.org> 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) | \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401061945.406JjW2X098802>