From a01be1645717a029e571fd0dbb42245f05aff88c Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 28 Jun 2020 13:18:11 -0700 Subject: [PATCH] =?utf8?q?getrandom:=20do=20not=20depend=20on=20=E2=80=98o?= =?utf8?q?pen=E2=80=99=20on=20mingw?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Similarly for at-internal, getloadavg. These modules do not call the ‘open’ function when they are compiled on mingw. On mingw, this avoids having to compile open.c when building Emacs, which does its own thing with ‘open’. * modules/at-internal, modules/getloadavg, modules/getrandom: (Depends-on): Don’t depend on ‘open’ on mingw. (Depends-on): Require AC_CANONICAL_HOST, for host_os. * modules/getloadavg (Depends-on): Depend on intprops, open, stdbool, stdlib only if compiling getloadavg.c. --- ChangeLog | 14 ++++++++++++++ modules/at-internal | 3 ++- modules/getloadavg | 9 +++++---- modules/getrandom | 3 ++- 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 84a1bd4727..c6e26120ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2020-06-28 Paul Eggert + + getrandom: do not depend on ‘open’ on mingw + Similarly for at-internal, getloadavg. These modules do not call + the ‘open’ function when they are compiled on mingw. On mingw, + this avoids having to compile open.c when building Emacs, which + does its own thing with ‘open’. + * modules/at-internal, modules/getloadavg, modules/getrandom: + (Depends-on): Don’t depend on ‘open’ on mingw. + (Depends-on): Require AC_CANONICAL_HOST, for host_os. + * modules/getloadavg (Depends-on): + Depend on intprops, open, stdbool, stdlib only if compiling + getloadavg.c. + 2020-06-28 Bruno Haible doc: Add a note about sigprocmask vs. pthread_sigmask. diff --git a/modules/at-internal b/modules/at-internal index d58c9b0b4b..2a37779f72 100644 --- a/modules/at-internal +++ b/modules/at-internal @@ -9,11 +9,12 @@ Depends-on: errno fcntl-h intprops -open +open [case $host_os in mingw*) false;; *) :;; esac] sys_stat unistd configure.ac: +AC_REQUIRE([AC_CANONICAL_HOST]) Makefile.am: lib_SOURCES += openat-priv.h openat-proc.c diff --git a/modules/getloadavg b/modules/getloadavg index 8adb9a7848..21955b782f 100644 --- a/modules/getloadavg +++ b/modules/getloadavg @@ -7,12 +7,13 @@ m4/getloadavg.m4 Depends-on: extensions -intprops -open -stdbool -stdlib +intprops [test $HAVE_GETLOADAVG = 0] +open [case $host_os in mingw*) false;; *) test $HAVE_GETLOADAVG = 0;; esac] +stdbool [test $HAVE_GETLOADAVG = 0] +stdlib [test $HAVE_GETLOADAVG = 0] configure.ac: +AC_REQUIRE([AC_CANONICAL_HOST]) gl_GETLOADAVG if test $HAVE_GETLOADAVG = 0; then AC_LIBOBJ([getloadavg]) diff --git a/modules/getrandom b/modules/getrandom index 76437eb5ad..f1c359706d 100644 --- a/modules/getrandom +++ b/modules/getrandom @@ -9,9 +9,10 @@ Depends-on: sys_random fcntl-h [test $HAVE_GETRANDOM = 0 || test $REPLACE_GETRANDOM = 1] minmax [test $HAVE_GETRANDOM = 0 || test $REPLACE_GETRANDOM = 1] -open [test $HAVE_GETRANDOM = 0 || test $REPLACE_GETRANDOM = 1] +open [case $host_os in mingw*) false;; *) test $HAVE_GETRANDOM = 0 || test $REPLACE_GETRANDOM = 1;; esac] configure.ac: +AC_REQUIRE([AC_CANONICAL_HOST]) gl_FUNC_GETRANDOM if test $HAVE_GETRANDOM = 0 || test $REPLACE_GETRANDOM = 1; then AC_LIBOBJ([getrandom]) -- 2.39.5