Date: Mon, 18 Jul 2022 00:34:50 GMT From: Xin LI <delphij@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 2fb4f6b75248 - stable/12 - file: Fix cross-compilation on Darwin/macOS Message-ID: <202207180034.26I0YowA086696@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=2fb4f6b7524828957ee70334f975ade127f09f1a commit 2fb4f6b7524828957ee70334f975ade127f09f1a Author: Jose Luis Duran <jlduran@gmail.com> AuthorDate: 2022-01-05 12:13:22 +0000 Commit: Xin LI <delphij@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202207180034.26I0YowA086696>