Changeset 91

Timestamp:

06/21/08 06:48:00 (4 months ago)

Author:

scottmc

Message:

Updated patch to get cmake a bit closer to building on Haiku.

Files:

• BePorts/trunk/dev-util/cmake/cmake-2.6.0-haiku.diff (modified) (19 diffs)

BePorts/trunk/dev-util/cmake/cmake-2.6.0-haiku.diff

@@ -1 +1 @@
-diff -ur cmake-2.6.0/Modules/CMakeFortranCompilerId.F90.in cmake-2.6.0-haiku/Modules/CMakeFortranCompilerId.F90.in
-5:53
-8 04:40:32
+6:04
+9 11:16:50
-@@ -48,6 +48,10 @@
-    PRINT *, 'INFO:platform[IRIX]'
@@ -14 +14 @@
- #elif defined(__QNX__) || defined(__QNXNTO__)
-diff -ur cmake-2.6.0/Modules/CMakePlatformId.h.in cmake-2.6.0-haiku/Modules/CMakePlatformId.h.in
-5:53
-8 04:43:37
+6:04
+9 11:16:50
-@@ -35,6 +35,11 @@
- #elif defined(__hpux) || defined(__hpux__)
@@ -29 +29 @@
- 
-diff -ur cmake-2.6.0/Modules/CheckForPthreads.c cmake-2.6.0-haiku/Modules/CheckForPthreads.c
-5:53
-8 04:45:32
+6:04
+9 11:16:50
-@@ -16,7 +16,7 @@
-   pthread_create(&tid[0], 0, runner, (void*)1);
@@ -42 +42 @@
-Only in cmake-2.6.0-haiku/Modules/Platform: Haiku.cmake
-diff -ur cmake-2.6.0/Source/CPack/cmCPackGeneratorFactory.cxx cmake-2.6.0-haiku/Source/CPack/cmCPackGeneratorFactory.cxx
-5:5
-8 04:57:39
+6:0
+9 11:16:50
-@@ -35,7 +35,7 @@
- #endif
@@ -64 +64 @@
-   this->RegisterGenerator("RPM", "RPM packages",
-diff -ur cmake-2.6.0/Source/cmCTest.cxx cmake-2.6.0-haiku/Source/cmCTest.cxx
-5:5
-8 05:10:52
+6:0
+9 11:16:50
-@@ -49,10 +49,15 @@
- 
@@ -83 +83 @@
- #define DEBUGERR std::cerr << __LINE__ << " "; std::cerr
- 
-cmSystemTools.cxx cmake-2.6.0-haiku/Source/cmSystemTools
-cmSystemTools.cxx       2008-05-05 18:25:5
-cmSystemTools.cxx 2008-06-19 06:11
-867,7 +867
-//  parts of CMake that expect to catch the signal from other child processes,
- so we explicitly wait to catch it here. This should be safe to do with
- popen() so long as we don't actually collect the zombie process ourselves.
+kwsys/DynamicLoader.cxx cmake-2.6.0-haiku/Source/kwsys/DynamicLoader
+kwsys/DynamicLoader.cxx 2008-05-05 18:26:0
+kwsys/DynamicLoader.cxx   2008-06-20 14:08
+331,7 +331
+
+---------------------------------------------------------------
+4. Implementation for BeOS
--#ifdef __BEOS__
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-diff -ur cmake-2.6.0/Source/kwsys/ProcessUNIX.c cmake-2.6.0-haiku/Source/kwsys/ProcessUNIX.c
-5:56
-19 09:01:05
+6:05
+20 14:06:56
-@@ -75,7 +75,7 @@
- typedef int kwsysProcess_ssize_t;
@@ -144 +108 @@
- static inline void kwsysProcess_usleep(unsigned int msec)
-diff -ur cmake-2.6.0/Source/kwsys/SystemTools.cxx cmake-2.6.0-haiku/Source/kwsys/SystemTools.cxx
-5:56
-08:38:09
-7
+6:05
+15:49:33
+12
- #define _chdir chdir
- #endif
- 
--#if defined(__BEOS__) && !defined(__ZETA__)
++#ifdef (__HAIKU__)
++#include <os/kernel.OS.h>
++#include <os/storage/Path.h>
++#endif
++
-+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__)
- #include <be/kernel/OS.h>
@@ -156 +125 @@
- 
-diff -ur cmake-2.6.0/Source/kwsys/testProcess.c cmake-2.6.0-haiku/Source/kwsys/testProcess.c
-5:56
-8 22:48:47
+6:05
+9 11:16:51
-@@ -34,7 +34,7 @@
- # pragma warn -8060 /* possibly incorrect assignment */
@@ -168 +137 @@
- static inline void testProcess_usleep(unsigned int msec)
-diff -ur cmake-2.6.0/Tests/Complex/Library/CMakeLists.txt cmake-2.6.0-haiku/Tests/Complex/Library/CMakeLists.txt
-5:57
-8 22:53:10
+6:05
+9 11:16:51
-@@ -53,7 +53,9 @@
-   )
@@ -182 +151 @@
- IF(${FOO_BAR_VAR} MATCHES "BAR")
-diff -ur cmake-2.6.0/Utilities/cmcurl/CMake/CurlTests.c cmake-2.6.0-haiku/Utilities/cmcurl/CMake/CurlTests.c
-5:59
-8 23:00:0
+6:06
+9 11:16:5
-@@ -38,6 +38,12 @@
- # define PLATFORM_AIX_V3
@@ -198 +167 @@
- #endif
-diff -ur cmake-2.6.0/Utilities/cmcurl/curl/curl.h cmake-2.6.0-haiku/Utilities/cmcurl/curl/curl.h
-5:59
-8 23:08:53
+6:06
+9 11:16:51
-@@ -1133,7 +1133,7 @@
- }
@@ -210 +179 @@
- 
-diff -ur cmake-2.6.0/Utilities/cmcurl/if2ip.c cmake-2.6.0-haiku/Utilities/cmcurl/if2ip.c
-5:59
-8 23:11:46
+6:06
+9 11:16:51
-@@ -39,7 +39,7 @@
-  */
@@ -222 +191 @@
- #include <sys/socket.h>
-diff -ur cmake-2.6.0/Utilities/cmcurl/select.c cmake-2.6.0-haiku/Utilities/cmcurl/select.c
-5:59
-8 23:13:59
+6:06
+9 11:16:51
-@@ -39,7 +39,7 @@
- #error "We can't compile without select() support!"
@@ -234 +203 @@
- #endif
-diff -ur cmake-2.6.0/Utilities/cmcurl/setup.h cmake-2.6.0-haiku/Utilities/cmcurl/setup.h
-5:59
-8 23:18:33
+6:06
+9 11:16:51
-@@ -264,7 +264,7 @@
- 
@@ -246 +215 @@
- #define sclose(x) close(x)
-diff -ur cmake-2.6.0/Utilities/cmtar/libtar.c cmake-2.6.0-haiku/Utilities/cmtar/libtar.c
-1
-8 23:23:29
+7
+9 11:16:51
-@@ -98,8 +98,8 @@
-     {
@@ -260 +229 @@
-     return -1;
-diff -ur cmake-2.6.0/Utilities/cmxmlrpc/xmlrpc_curl_transport.c cmake-2.6.0-haiku/Utilities/cmxmlrpc/xmlrpc_curl_transport.c
-1
-8 23:25:53
+7
+9 11:16:51
-@@ -10,7 +10,7 @@
- 
@@ -272 +241 @@
- #endif
-diff -ur cmake-2.6.0/Utilities/cmzlib/zconf.h cmake-2.6.0-haiku/Utilities/cmzlib/zconf.h
-1
-8 23:28:59
+7
+9 11:16:51
-@@ -237,7 +237,7 @@
- #  endif
@@ -284 +253 @@
- #      define ZEXPORT   __declspec(dllexport)
-diff -ur cmake-2.6.0/Utilities/cmzlib/zutil.h cmake-2.6.0-haiku/Utilities/cmzlib/zutil.h
-1
-8 23:30:49
+7
+9 11:16:51
-@@ -147,7 +147,13 @@
- #  define OS_CODE  0x0f
@@ -302 +271 @@
- 
-diff -ur cmake-2.6.0/bootstrap cmake-2.6.0-haiku/bootstrap
-5:52
-8 23:35:0
+6:04
+9 11:16:5
-@@ -73,6 +73,13 @@
-   cmake_system_beos=false