Date: Sun, 3 Jan 2021 15:42:32 GMT From: Conrad Meyer <cem@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: bcae12b591d9 - main - zstd: Fix non-FreeBSD CI libzstd build Message-ID: <202101031542.103FgWZQ013302@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by cem: URL: https://cgit.FreeBSD.org/src/commit/?id=bcae12b591d9b5f3073c71f7e090dc8611360eb6 commit bcae12b591d9b5f3073c71f7e090dc8611360eb6 Author: Conrad Meyer <cem@FreeBSD.org> AuthorDate: 2021-01-03 15:39:12 +0000 Commit: Conrad Meyer <cem@FreeBSD.org> CommitDate: 2021-01-03 15:42:00 +0000 zstd: Fix non-FreeBSD CI libzstd build Fix non-FreeBSD CI build after v1.4.8. This definition was only used in zstd(1), which isn't part of non-FreeBSD CI (I guess). The ifdef was added in v1.4.5 import. Upstream does not currently support shared-linked zstd(1), but I have proposed https://github.com/facebook/zstd/pull/2450 . If that is adopted, we can add -DZSTD_PROGRAMS_LINK_SHARED to our libzstd build and drop some diffs. Reported by: uqs --- sys/contrib/zstd/lib/compress/zstd_compress_internal.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/contrib/zstd/lib/compress/zstd_compress_internal.h b/sys/contrib/zstd/lib/compress/zstd_compress_internal.h index 174bc92ce623..4749da101be2 100644 --- a/sys/contrib/zstd/lib/compress/zstd_compress_internal.h +++ b/sys/contrib/zstd/lib/compress/zstd_compress_internal.h @@ -1198,8 +1198,9 @@ size_t ZSTD_referenceExternalSequences(ZSTD_CCtx* cctx, rawSeq* seq, size_t nbSe /** ZSTD_cycleLog() : * condition for correct operation : hashLog > 1 */ -#ifdef __FreeBSD__ /* This symbol is needed by dll-linked CLI zstd(1). */ -ZSTDLIB_API U32 ZSTD_cycleLog(U32 hashLog, ZSTD_strategy strat); -#endif +/* Begin FreeBSD - This symbol is needed by dll-linked CLI zstd(1). */ +ZSTDLIB_API +/* End FreeBSD */ +U32 ZSTD_cycleLog(U32 hashLog, ZSTD_strategy strat); #endif /* ZSTD_COMPRESS_H */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101031542.103FgWZQ013302>