From: Bruno Haible <bruno@clisp.org>
Date: Fri, 18 Feb 2011 03:15:19 +0000 (+0100)
Subject: getloadavg: Fix link error on Solaris 2.6.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0fdbb3f593aa1d50e370273ae9caabfb0e49318;p=pspp

getloadavg: Fix link error on Solaris 2.6.

* modules/getloadavg (Link): New section.
* modules/getloadavg-tests (Makefile.am): Use GETLOADAVG_LIBS for
linking test-getloadavg.
* doc/glibc-functions/getloadavg.texi: Mention that Solaris 2.6 lacks
getloadavg.
---

diff --git a/ChangeLog b/ChangeLog
index a11a8d6abf..4b69d36190 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-02-17  Bruno Haible  <bruno@clisp.org>
+
+	getloadavg: Fix link error on Solaris 2.6.
+	* modules/getloadavg (Link): New section.
+	* modules/getloadavg-tests (Makefile.am): Use GETLOADAVG_LIBS for
+	linking test-getloadavg.
+	* doc/glibc-functions/getloadavg.texi: Mention that Solaris 2.6 lacks
+	getloadavg.
+
 2011-02-17  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* lib/getloadavg.c (getloadavg) [sgi]: Make ldav_off of type ptrdiff_t.
diff --git a/doc/glibc-functions/getloadavg.texi b/doc/glibc-functions/getloadavg.texi
index df166f19b0..652257a4a7 100644
--- a/doc/glibc-functions/getloadavg.texi
+++ b/doc/glibc-functions/getloadavg.texi
@@ -8,7 +8,7 @@ Portability problems fixed by Gnulib:
 @itemize
 @item
 This function is missing on some platforms:
-AIX 5.1, HP-UX 11, IRIX 6.5, OSF/1 5.1, Cygwin, mingw, Interix 3.5, BeOS.
+AIX 5.1, HP-UX 11, IRIX 6.5, OSF/1 5.1, Solaris 2.6, Cygwin, mingw, Interix 3.5, BeOS.
 @item
 This function is declared in @code{<sys/loadavg.h>}, not @code{<stdlib.h>},
 on some platforms:
diff --git a/modules/getloadavg b/modules/getloadavg
index fcbce4f7c5..9db688b4cf 100644
--- a/modules/getloadavg
+++ b/modules/getloadavg
@@ -20,6 +20,9 @@ Makefile.am:
 Include:
 <stdlib.h>
 
+Link:
+$(GETLOADAVG_LIBS)
+
 License:
 GPL
 
diff --git a/modules/getloadavg-tests b/modules/getloadavg-tests
index b5ad8cc3b3..c653ae9bef 100644
--- a/modules/getloadavg-tests
+++ b/modules/getloadavg-tests
@@ -9,3 +9,4 @@ configure.ac:
 Makefile.am:
 TESTS += test-getloadavg
 check_PROGRAMS += test-getloadavg
+test_getloadavg_LDADD = $(LDADD) @GETLOADAVG_LIBS@