Render lib/getloadavg.c patches more permanent

* 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.

(cherry picked from commit a84a934a4481d35ab2200f8dedc9ed3af6a5571d)

diff --git a/admin/gnulib-patches/lib/getloadavg.c.diff b/admin/gnulib-patches/lib/getloadavg.c.diff
new file mode 100644 (file)
index 0000000..afa6337
--- /dev/null
+++ b/admin/gnulib-patches/lib/getloadavg.c.diff
@@ -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

diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index 54dcf275d55a529a53925cf567809301e1d1b6ae..88f74d6eb7f6d55c14ec2bb85cb363431d68624e 100755 (executable)
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -80,6 +80,10 @@ case $src in
   *) src=$src/ ;;
 esac
 
+GNULIB_TOOL_FLAGS="$GNULIB_TOOL_FLAGS
+  --local-dir="$src"admin/gnulib-patches
+"
+
 # Gnulib's source directory.
 gnulib_srcdir=${1-$src../gnulib}
 

diff --git a/lib/gnulib.mk.in b/lib/gnulib.mk.in
index fb34cf2cc1dcdacc1c97bf3d7f0aafa37f49216e..cf7d0470f67e44369ce84060613bec83554afc72 100644 (file)
--- a/lib/gnulib.mk.in
+++ b/lib/gnulib.mk.in
@@ -22,6 +22,7 @@
 # Generated by gnulib-tool.
 # Reproduce by:
 # gnulib-tool --import \
+#  --local-dir=./admin/gnulib-patches \
 #  --lib=libgnu \
 #  --source-base=lib \
 #  --m4-base=m4 \