[commit: ghc] master: Fix sys/cpuset.h on FreeBSD 9.1; patch from kazu-yamamoto; fixes #7708 (4a8e254)

Ian Lynagh igloo at earth.li
Fri Mar 1 02:34:03 CET 2013


Repository : http://darcs.haskell.org/ghc.git/

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/4a8e254cbc16b3a4f264c4dda15d8eeddd13abc7

>---------------------------------------------------------------

commit 4a8e254cbc16b3a4f264c4dda15d8eeddd13abc7
Author: Ian Lynagh <ian at well-typed.com>
Date:   Fri Mar 1 00:50:47 2013 +0000

    Fix sys/cpuset.h on FreeBSD 9.1; patch from kazu-yamamoto; fixes #7708

>---------------------------------------------------------------

 configure.ac | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 78a157b..4ae2f44 100644
--- a/configure.ac
+++ b/configure.ac
@@ -671,7 +671,14 @@ dnl    off_t, because it will affect the result of that test.
 AC_SYS_LARGEFILE
 
 dnl ** check for specific header (.h) files that we are interested in
-AC_CHECK_HEADERS([bfd.h ctype.h dirent.h dlfcn.h errno.h fcntl.h grp.h limits.h locale.h nlist.h pthread.h pwd.h signal.h sys/cpuset.h sys/mman.h sys/resource.h sys/select.h sys/time.h sys/timeb.h sys/timers.h sys/times.h sys/utsname.h sys/wait.h termios.h time.h utime.h windows.h winsock.h sched.h])
+AC_CHECK_HEADERS([bfd.h ctype.h dirent.h dlfcn.h errno.h fcntl.h grp.h limits.h locale.h nlist.h pthread.h pwd.h signal.h sys/param.h sys/mman.h sys/resource.h sys/select.h sys/time.h sys/timeb.h sys/timers.h sys/times.h sys/utsname.h sys/wait.h termios.h time.h utime.h windows.h winsock.h sched.h])
+
+dnl sys/cpuset.h needs sys/param.h to be included first on FreeBSD 9.1; #7708
+AC_CHECK_HEADERS([sys/cpuset.h], [], [],
+[[#if HAVE_SYS_PARAM_H
+# include <sys/param.h>
+#endif
+]])
 
 dnl ** check if it is safe to include both <time.h> and <sys/time.h>
 AC_HEADER_TIME





More information about the ghc-commits mailing list