From nobody Tue Jan 25 01:40:00 2022 X-Original-To: dev-commits-src-branches@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 8E9291972560; Tue, 25 Jan 2022 01:40:02 +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 4JjV0K27m6z4ZcH; Tue, 25 Jan 2022 01:40:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643074801; 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=FhupYT76d5YeLAnaMyA4OgcSIDrkRFDsrwUc8Y3QLqc=; b=tQN+solSIabYjV/s/G9ODzsmG1P4jG9GNVNm74+ZorPp+jK8nlDs6zwTGF8pkySkvw2RhW Q2DPqeAJuj0SLU72btk5q+zJx/au23PXv5MclAytx6tugY2UesQ64PDmZRziJlQO34vDKg Ug9hP+k5tYkQdbKrUx9bOgIWCnSKWAlzImlAO3I88XsNatc6lx8kWDIUHE6DU+3EtOy3fw SBsf3sMHui7gv8KXYKCIZru3unZ1C+QUe4kST9T+zzv6iyjOLT/vEi2cxwVG70zmMhvHMj 6i5FsUgWlhPVzoks6X7IBVK7D7vGfKftlBFUETk9b6j9tgw0mNB36BpWDD9U1w== 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 D982620B37; Tue, 25 Jan 2022 01:40:00 +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 20P1e05H043749; Tue, 25 Jan 2022 01:40:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20P1e033043738; Tue, 25 Jan 2022 01:40:00 GMT (envelope-from git) Date: Tue, 25 Jan 2022 01:40:00 GMT Message-Id: <202201250140.20P1e033043738@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: 85e89ae4219f - stable/13 - zlib: Fix bootstrap build on macOS List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 85e89ae4219ff9f1e3dfd618a0edb68bbf927da0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643074801; 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=FhupYT76d5YeLAnaMyA4OgcSIDrkRFDsrwUc8Y3QLqc=; b=Ob8kqSEe+rr326lQ2BpqG0lcEPYEU/7zyPCf40x7WY4glR2G9SViE4vEuKFCUIus0xRVDM pEUbKKaN1p3ZxFvajWVuCM1bJEs7zOifJTFiGRmeUFq+tUhyHFM2UcU4IPcBAX8OXbaOSp eCLZ20ZANGWNY6SjQcawGVq88Wx0nvgmjLdC258xgzrEwyYJ4E6yRWXHasE0amFC+xARev JO/qF5J7QB0r7In91ojvGwk75MdXN9vyDf4ln96FRSrpbcMbGyHR5VAzDzEIVrKt/6Kg+M GF/jZEC+2XpSwGd+cGQhucKoVNW5OZBy27QWm+YLWuVM4x0667iI9b1XHK1zzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643074801; a=rsa-sha256; cv=none; b=qeUsPGdrIxilyoaYtZ/NufF+F0zI8HOXHBA65Gv4yMUW6LBvCaGl8bnCbzw6DVJRf8Qcfn SEehm+fqFSlWzPCammreP5zKOF/2ZxhOoQTjKC94qJGN2U8Icf4CtMswieiz7ouWA44san jYp1BbASuZ36TB8Yk9kVrfa5xj1tUGcuP8ZaOU0VRLMEqjRQNWhBAuT52Ul572TQqvyG2b 5Zvx/cH4jr84tsuHGyLagjsl0QtvbuuloGou1lTa5gVFXESxG5ULM7/hY9fYPLuUsrJmxQ /8/jrcFRRJCIT6Q4f2CzjeZoBkpIwVkYYKS+XAVZ3iAegfFiiWPHV2WI17Aimw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=85e89ae4219ff9f1e3dfd618a0edb68bbf927da0 commit 85e89ae4219ff9f1e3dfd618a0edb68bbf927da0 Author: Jessica Clarke AuthorDate: 2021-12-06 22:24:42 +0000 Commit: Jessica Clarke CommitDate: 2022-01-24 23:59:16 +0000 zlib: Fix bootstrap build on macOS gzlib.c uses lseek but does not include unistd.h, where it is defined to live. On FreeBSD this happens to work due to sys/types.h declaring it, but on macOS it fails due to being only implicitly declared, which is treated as an error by default by the system Clang. MFC after: 1 week (cherry picked from commit 6010a892b4258e90037dabf9765066d07b86f13f) --- sys/contrib/zlib/gzlib.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/contrib/zlib/gzlib.c b/sys/contrib/zlib/gzlib.c index b4cb5e4a48cf..ea34341d5d5e 100644 --- a/sys/contrib/zlib/gzlib.c +++ b/sys/contrib/zlib/gzlib.c @@ -7,6 +7,7 @@ #include "gzguts.h" #include "zutil.h" +#include #if defined(_WIN32) && !defined(__BORLANDC__) && !defined(__MINGW32__) # define LSEEK _lseeki64