From nobody Fri Jan 07 14:53:50 2022 X-Original-To: dev-commits-src-main@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 9F6D819321BA; Fri, 7 Jan 2022 14:53:50 +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 4JVmSZ2mf3z3HKT; Fri, 7 Jan 2022 14:53:50 +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 4085255B2; Fri, 7 Jan 2022 14:53:50 +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 207Ero9S041464; Fri, 7 Jan 2022 14:53:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 207EroaL041463; Fri, 7 Jan 2022 14:53:50 GMT (envelope-from git) Date: Fri, 7 Jan 2022 14:53:50 GMT Message-Id: <202201071453.207EroaL041463@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: f5ccb3a33e23 - main - file: Fix cross-compilation on Darwin/macOS List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f5ccb3a33e23797b98860cea497d989a338af446 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641567230; 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=3mii1j4ijN1tlpWf3R9UD+3cQW8JXlRQmvaoMoMl0wQ=; b=KF0ELomhTCkPxcjo+MpiwzU4ZqWke70x/Kz/Oi1SEcg+Fwn7bBBMtWCI/jinikxwYnfc2s 02HYS+pRBTactF6imbCc+YkrUiiLO9gjwooexUTlp/J+aj7nx0vXoGz/rLJ3HL1GcPVeH8 cZ1ARMGs3cBDP3yr7YA4Jmy6CAUHMlIL5EVAJREQxDhaVi/bv2Yw1tLSpyA5//p52ekl+D uibyQJOoZEzK4jUM+qyZ2w0YrxT6FF2NH+vWmfl+hAR/BVC4nmWydBzxqH09i187J9Id+8 rtYks8mqwqQFpL6jzstMa06o6zObUKpwIJbniAyMGgt1YqvgLhK8wZ0g+5g27A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641567230; a=rsa-sha256; cv=none; b=knm78QpkKMbGfDbe7M6RQBnFGyDi3EdlqIjy9FoVfqq+7ITs9F1atDy7SVl2DM0aOQ2bM6 pGQMd6M7m9CCVOXgvVvXUydHToTM0441bdz88Zlqipx/HKcOCfPrbyD3GWogwFnuEK70SG xbUpppOjNiHIm7RUMixo/u+60QliDziyiBe0+JE/Dgi5Zmks+SiP4eijXU7BUYOlVz2meL pdMl4QUipXUM49E1Y1Lv1ItWc388n8gzLOEKe7sYpElc7KORIaUGrN8k7ZvZSAhD52mnkL OHgRIxn6jwNy4ud2/6E6tve6dlM/qwqQtGENX1iHoUfELIXMPDQwrlWHyKVENA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f5ccb3a33e23797b98860cea497d989a338af446 commit f5ccb3a33e23797b98860cea497d989a338af446 Author: Jose Luis Duran AuthorDate: 2022-01-05 12:13:22 +0000 Commit: Warner Losh CommitDate: 2022-01-07 14:52:34 +0000 file: Fix cross-compilation on Darwin/macOS Darwin/macOS does not have pipe2(2). Apply a similar guard as in f3d7ace4b235422e5ccff0315f2965ac935241d8 after 43a5ec4eb41567cc92586503212743d89686d78f. Pull Request: https://github.com/freebsd/freebsd-src/pull/574 --- lib/libmagic/config.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/libmagic/config.h b/lib/libmagic/config.h index 35d090dd48b9..f19fc581f6f5 100644 --- a/lib/libmagic/config.h +++ b/lib/libmagic/config.h @@ -127,7 +127,9 @@ #define HAVE_NEWLOCALE 1 /* Define to 1 if you have the `pipe2' function. */ +#ifndef __APPLE__ /* Cross building tools on macOS */ #define HAVE_PIPE2 1 +#endif /* Define to 1 if you have the `pread' function. */ #define HAVE_PREAD 1