From owner-dev-commits-src-main@freebsd.org Sun Jan 3 15:42:33 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0B04A4D4C76; Sun, 3 Jan 2021 15:42: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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D83146yHKz3Jw1; Sun, 3 Jan 2021 15:42:32 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 E18C32219; Sun, 3 Jan 2021 15:42:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 103FgWHF013303; Sun, 3 Jan 2021 15:42:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 103FgWZQ013302; Sun, 3 Jan 2021 15:42:32 GMT (envelope-from git) Date: Sun, 3 Jan 2021 15:42:32 GMT Message-Id: <202101031542.103FgWZQ013302@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Conrad Meyer Subject: git: bcae12b591d9 - main - zstd: Fix non-FreeBSD CI libzstd build MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bcae12b591d9b5f3073c71f7e090dc8611360eb6 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Jan 2021 15:42:33 -0000 The branch main has been updated by cem: URL: https://cgit.FreeBSD.org/src/commit/?id=bcae12b591d9b5f3073c71f7e090dc8611360eb6 commit bcae12b591d9b5f3073c71f7e090dc8611360eb6 Author: Conrad Meyer AuthorDate: 2021-01-03 15:39:12 +0000 Commit: Conrad Meyer 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 */