From nobody Tue Jan 25 01:40:22 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 3954F1973227; Tue, 25 Jan 2022 01:40:25 +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 4JjV0l73lkz4b2H; Tue, 25 Jan 2022 01:40:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643074824; 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=xu3W20pwLmfM17YIXWCyrpK6cIqzgdkkaIWujyHDXto=; b=EinjLJxsijM/Q2b2TZ4YrnZC7+/XNuDtsmtpbckIn8Fo765KwFdCrJIYL5fJAbckpqZANw aamijDIXC+XRyruvG46ykcruMvgMUMv0I/YgQAmqwg05drQVj8eR47YjRKVShi4NHuD5oZ mHSq5j+ZZY0tkKUU6hnaWZpd6neps6bEA/3QCe+6ZxzTF/Xok1nkWhi0P8OnEUbni0wFOS 0BW+GlXUEpTjTKdZjCI1G3QgziMNhINxJKZIxJLq884TE11WhJo0oBrUPizyXAUnJPXVcr VKb+41aXxE1l/9B5BEOzjKul8IYSYLOOp5hJyFwhfJgQA/fAwqvWkoLhDo6Ebg== 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 A9A15209F0; Tue, 25 Jan 2022 01:40:22 +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 20P1eMU1051689; Tue, 25 Jan 2022 01:40:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20P1eMsx051688; Tue, 25 Jan 2022 01:40:22 GMT (envelope-from git) Date: Tue, 25 Jan 2022 01:40:22 GMT Message-Id: <202201250140.20P1eMsx051688@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: 925c54a30fde - stable/13 - file: Fix cross-compilation on Darwin/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: 925c54a30fdea77a81fd86bab4c9b0b9f4664d38 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643074824; 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=xu3W20pwLmfM17YIXWCyrpK6cIqzgdkkaIWujyHDXto=; b=LpRnBBXFTVBMrWZxUrSkBCMx7KdEkN7p/XVwlSNXMnIhKwioOKKL0cMXiVOeoXCdmUmgyI ic++lb6fC4G5kT6/qvtAJyEcRDyIW+sb0/1L45JKZ/08szsZY/yPeOQ1IWJh13Mo5br6AZ T/V1UPvEbnbuVFedR1sSM7C3NSUC0TR3Xhx+aJ64QkKrgYPfKQFHvyRVt5m8vYKm8HJcx4 HcK+JFZJdfmvXGpo4TTobwOQbXu5litFbUSV8uZA6PjA8NIErfnSFrYiecpvP1AX0IYAGJ DFZkQQdfYy8OrFIIoWvhl7aDYZw/xPcyN/ivGdeD0GLktMECB8cM1BKiFwpcuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643074824; a=rsa-sha256; cv=none; b=pibyi19KhhS+d3Agf4zB8I2mh1LOdZ41P9wDJrWBQDbDkbFYG6qJk+hkhwx0u5UTxeYOCI lPiWp4Xx/tv1pu+tXuKdQfnW6SYqIXoCD+ec7dBwzttppzf0AnBbHITpK5Ssz23IG2ugPP vP3L10aCYfyqw10JuInARjfh4HsnReG2MI1iYL1A3nkHvpNq1U11nZFC0pS3ndinGQYtS7 OJG50R/N5GaePTnwTTD3ST/eVDobnvhOwFdF2cc3fYNzy+nxBCgdA8o5cxdERZU9SEApqJ tVQweJvwrlPOngLTHLuLqWL76qliyJOCnuHpSeGHLDG1/Aag1t+R/QSx9ApYHg== 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=925c54a30fdea77a81fd86bab4c9b0b9f4664d38 commit 925c54a30fdea77a81fd86bab4c9b0b9f4664d38 Author: Jose Luis Duran AuthorDate: 2022-01-05 12:13:22 +0000 Commit: Jessica Clarke CommitDate: 2022-01-25 00:05:17 +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 382314f12928..8c2f2619f01d 100644 --- a/lib/libmagic/config.h +++ b/lib/libmagic/config.h @@ -126,7 +126,9 @@ #endif /* 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