[cmake-commits] alex committed CMakeLists.txt 1.24 1.25 config.h.in 1.11 1.12 internal.h 1.6 1.7

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Utilities/cmtar
In directory public:/mounts/ram/cvs-serv13894

Modified Files:
	CMakeLists.txt config.h.in internal.h 
Log Message:

COMP: add a check for makedev, which isn't available with the PGI compiler
on Cray XT3

Alex


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmtar/CMakeLists.txt,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- CMakeLists.txt	19 Oct 2006 19:45:28 -0000	1.24
+++ CMakeLists.txt	17 Sep 2007 19:18:35 -0000	1.25
@@ -107,6 +107,7 @@
     glob
     major
     minor
+    makedev
     )
   CHECK_SYMBOL_EXISTS_EX("${func}")
 ENDFOREACH(func)

Index: config.h.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmtar/config.h.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- config.h.in	19 Oct 2006 19:00:09 -0000	1.11
+++ config.h.in	17 Sep 2007 19:18:35 -0000	1.12
@@ -9,6 +9,9 @@
 /* Define if your system has a working minor */
 #cmakedefine HAVE_MINOR @HAVE_MINOR@
 
+/* Define if your system has a working minor */
+#cmakedefine HAVE_MAKEDEV @HAVE_MAKEDEV@
+
 /* Define to 1 if you have the <ctype.h> header file. */
 #cmakedefine HAVE_CTYPE_H @HAVE_CTYPE_H@
 

Index: internal.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmtar/internal.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- internal.h	31 Dec 2005 15:33:29 -0000	1.6
+++ internal.h	17 Sep 2007 19:18:35 -0000	1.7
@@ -25,3 +25,11 @@
 #ifndef HAVE_MINOR
 # define minor(dev) ((int)((dev) & 0xff))
 #endif
+/* On Cray XT3 when using thr PGI pgcc 7.0.4 sys/sysmacros.h ends up without
+   makedev(), since __i386__ is not defined when GLIBC_HAVE_LONG_LONG should
+   be enabled in features.h */
+#ifndef HAVE_MAKEDEV
+# define makedev(major, minor) ((((int)((major) & 0xff)) << 8 ) \
+                               | ((int)((minor) & 0xff)) )
+#endif
+