From nobody Mon Jul 18 00:34:50 2022 X-Original-To: dev-commits-src-all@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 4LmNJp2mc5z4WbYg; Mon, 18 Jul 2022 00:34: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 4LmNJp256Sz3klW; Mon, 18 Jul 2022 00:34:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658104490; 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=y9ufq1RajKpVe1ND8PBbraOrUxFhGzESeQ3Y2vYrZDY=; b=tIlsr1RYahyQu45dr56TxMo2r+pv2btOJIHQQb8Wy9lJsLRPmzHET4IUFidLCB0tRizIFL pG9AkMA9b0Kyr5M88tZWM4aEKbPc3QM4w0I1Jc8zAzHrDnBEz7rgacou2ZsBZvCn8SRu8U LCKS0/YcePOfphRirPvdQevlx9pS5vJ0Rqf857rZ+iFUU4IKtaWmt0R5F0977FzA1Vg/6k BYy2zJGL+dX4M5SdZrQuZnTtyqPgrh5wL4d5airn90st69B+3yYAn/TXp96wvC8LeQuzzI GJBbd+yTnFA5ErZw2wACm1oXb87GG79HMY48kELHBBMs2vpmqRVnaPGAwFZU2Q== 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 4LmNJp19t5zKck; Mon, 18 Jul 2022 00:34: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 26I0Yolb086697; Mon, 18 Jul 2022 00:34:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26I0YowA086696; Mon, 18 Jul 2022 00:34:50 GMT (envelope-from git) Date: Mon, 18 Jul 2022 00:34:50 GMT Message-Id: <202207180034.26I0YowA086696@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 2fb4f6b75248 - stable/12 - file: Fix cross-compilation on Darwin/macOS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 2fb4f6b7524828957ee70334f975ade127f09f1a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658104490; 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=y9ufq1RajKpVe1ND8PBbraOrUxFhGzESeQ3Y2vYrZDY=; b=O7pg6s/FUZwupiUZtV6Txe+ju911EsPssqHnGsAF69ToSM32MgOZ8Cy10U/dslmsIafbVa 1uyf2tc5hscxs7aY6cESqNcSpOaUpN+HrLqbfZjwjlGHWgzGFDvRKxwM8Muc9YaXkBr8nP 2rG0BDzxfAOR2sKcUWrRpaYxUwtbpBmDSt3dc3y4XM7srzcTTh2cs9mI4rtZq1n6yftvAp biEXdxHFPCc4OeK7xJA/Hgup1ow7KR96e7KqKkt4g6PFwPNoA8QDFdgb6i4UKNpG5SaEq5 vudoysCAV2nRZSpUMOlSsMISjMnugKi/SyfMTWR/5ZNq3xIVYc7J4tI2qfY+4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658104490; a=rsa-sha256; cv=none; b=HZN29R3SnIiDifVfcVac17Nbu9oDvo5Dmh4CbQmQH1MD8OXDomMvM3dC3Dia5cjFCq6nli NFpOZRHXJ5s3t34SWcHUjxyAJQijqVPEB1wZlD3Z99U/33OSt3y8XO4uz/shQNWUcgX+K/ IH4gXjfUtyf0BrqWnT8SWYHi7J6MzqHD2EQ0Q6RL80KmQmga0liuBU1wS/uFbRQQs++2Dr QxP5byAQcjilWDrJVkWtgi/t+EQVNKxAE+aucy0Mqkt+DgvMf2eppzC7VaQzLXN2op16W9 q2mqQIUkM1o8dfYCP4W4V2r8Meuggj7Ka0nc6ck9o4K45MDXhXMB7UeO33QSsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=2fb4f6b7524828957ee70334f975ade127f09f1a commit 2fb4f6b7524828957ee70334f975ade127f09f1a Author: Jose Luis Duran AuthorDate: 2022-01-05 12:13:22 +0000 Commit: Xin LI CommitDate: 2022-07-18 00:34:20 +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 (cherry picked from commit f5ccb3a33e23797b98860cea497d989a338af446) --- 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