mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 06:20:55 -08:00
Code Issues Projects Releases Wiki Activity

Render lib/getloadavg.c patches more permanent

Browse source 
* admin/gnulib-patches/lib/getloadavg.c.diff: New file.

* admin/merge-gnulib (GNULIB_TOOL_FLAGS): Set --local-dir to
admin/gnulib-patches.

* lib/gnulib.mk.in: Update from Gnulib.
This commit is contained in:
Po Lu 2025-04-21 09:37:55 +08:00
parent 7ac6b33560
commit a84a934a44
3 changed files with 19 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

14
admin/gnulib-patches/lib/getloadavg.c.diff Normal file
View file

@ -0,0 +1,14 @@
diff --git a/lib/getloadavg.c b/lib/getloadavg.c
index 9da41c16c02..1cb1c01097d 100644
--- a/lib/getloadavg.c
+++ b/lib/getloadavg.c
@@ -499,7 +499,8 @@ getloadavg (double loadavg[], int nelem)
}
# endif
-# if !defined (LDAV_DONE) && (defined __linux__ || defined __ANDROID__)
+# if !defined (LDAV_DONE) && (defined __linux__ || defined __ANDROID__) \
+ && (!defined __ANDROID__ || __ANDROID_API__ >= 13)
/* Linux without glibc, Android, Cygwin */
# define LDAV_DONE
# undef LOAD_AVE_TYPE

4
admin/merge-gnulib
View file

@ -80,6 +80,10 @@ case $src in
*) src=$src/ ;; *) src=$src/ ;;
esac esac
GNULIB_TOOL_FLAGS="$GNULIB_TOOL_FLAGS
--local-dir="$src"admin/gnulib-patches
"
# Gnulib's source directory. # Gnulib's source directory.
gnulib_srcdir=${1-$src../gnulib} gnulib_srcdir=${1-$src../gnulib}

1
lib/gnulib.mk.in
View file

@ -22,6 +22,7 @@
# Generated by gnulib-tool. # Generated by gnulib-tool.
# Reproduce by: # Reproduce by:
# gnulib-tool --import \ # gnulib-tool --import \
# --local-dir=./admin/gnulib-patches \
# --lib=libgnu \ # --lib=libgnu \
# --source-base=lib \ # --source-base=lib \
# --m4-base=m4 \ # --m4-base=m4 \