From a3d146fd8a6e8e2301edd2c9e95640fa346fb9d8 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 24 Feb 2020 17:55:00 -0800 Subject: [PATCH] Update from Gnulib This incorporates: 2020-02-24 getloadavg: don't use /usr/local when cross-compiling on AIX 2020-02-24 fcntl: add witness of gnulib override * lib/fcntl.in.h, m4/getloadavg.m4: Copy from Gnulib. --- lib/fcntl.in.h | 6 ++++++ m4/getloadavg.m4 | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/fcntl.in.h b/lib/fcntl.in.h index b2e1e5130d9..0a21c957baf 100644 --- a/lib/fcntl.in.h +++ b/lib/fcntl.in.h @@ -116,9 +116,15 @@ _GL_WARN_ON_USE (creat, "creat is not always POSIX compliant - " # endif _GL_FUNCDECL_RPL (fcntl, int, (int fd, int action, ...)); _GL_CXXALIAS_RPL (fcntl, int, (int fd, int action, ...)); +# if !GNULIB_defined_rpl_fcntl +# define GNULIB_defined_rpl_fcntl 1 +# endif # else # if !@HAVE_FCNTL@ _GL_FUNCDECL_SYS (fcntl, int, (int fd, int action, ...)); +# if !GNULIB_defined_fcntl +# define GNULIB_defined_fcntl 1 +# endif # endif _GL_CXXALIAS_SYS (fcntl, int, (int fd, int action, ...)); # endif diff --git a/m4/getloadavg.m4 b/m4/getloadavg.m4 index 3bd2a142e73..8e96965d828 100644 --- a/m4/getloadavg.m4 +++ b/m4/getloadavg.m4 @@ -7,7 +7,7 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 8 +#serial 9 # Autoconf defines AC_FUNC_GETLOADAVG, but that is obsolescent. # New applications should use gl_GETLOADAVG instead. @@ -45,7 +45,9 @@ AC_CHECK_FUNC([getloadavg], [], # There is a commonly available library for RS/6000 AIX. # Since it is not a standard part of AIX, it might be installed locally. gl_getloadavg_LIBS=$LIBS - LIBS="-L/usr/local/lib $LIBS" + if test $cross_compiling != yes; then + LIBS="-L/usr/local/lib $LIBS" + fi AC_CHECK_LIB([getloadavg], [getloadavg], [LIBS="-lgetloadavg $LIBS" gl_func_getloadavg_done=yes], [LIBS=$gl_getloadavg_LIBS]) -- 2.39.2