HaikuPorts
  • Login
  • Preferences
  • Help/Guide
  • Wiki
  • Timeline
  • Roadmap
  • View Tickets
  • Search
  • Port Log
  • Blog

Context Navigation

  • Back to Ticket #61

Ticket #61: cmake-2.6.0-haiku.diff

File cmake-2.6.0-haiku.diff, 4.4 KB (added by scottmc, 7 years ago)
Line 
1diff -a -r -c cmake-2.6.0/Modules/CheckForPthreads.c cmake-2.6.0-h/Modules/CheckForPthreads.c
2*** cmake-2.6.0/Modules/CheckForPthreads.c      Mon May  5 11:25:53 2008
3--- cmake-2.6.0-h/Modules/CheckForPthreads.c    Fri May  9 17:17:29 2008
4***************
5*** 16,22 ****
6    pthread_create(&tid[0], 0, runner, (void*)1);
7    pthread_create(&tid[1], 0, runner, (void*)2);
8   
9! #if defined(__BEOS__) && !defined(__ZETA__)  // (no usleep on BeOS 5.)
10    usleep(1); // for strange behavior on single-processor sun
11  #endif
12 
13--- 16,22 ----
14    pthread_create(&tid[0], 0, runner, (void*)1);
15    pthread_create(&tid[1], 0, runner, (void*)2);
16   
17! #if defined(__BEOS__) && !defined(__HAIKU__) && !defined(__ZETA__)  // (no usleep on BeOS 5.)
18    usleep(1); // for strange behavior on single-processor sun
19  #endif
20 
21
22diff -a -r -c cmake-2.6.0/Source/cmSystemTools.cxx cmake-2.6.0-h/Source/cmSystemTools.cxx
23*** cmake-2.6.0/Source/cmSystemTools.cxx        Mon May  5 11:25:55 2008
24--- cmake-2.6.0-h/Source/cmSystemTools.cxx      Fri May  9 17:19:40 2008
25***************
26*** 1696,1702 ****
27      }
28 
29  // no fchmod on BeOS 5...do pathname instead.
30! #if defined(__BEOS__) && !defined(__ZETA__)
31    if ((oflags & O_CREAT) && chmod(pathname, mode))
32      {
33      return -1;
34--- 1696,1702 ----
35      }
36 
37  // no fchmod on BeOS 5...do pathname instead.
38! #if defined(__BEOS__) && !defined(__HAIKU__) && !defined(__ZETA__)
39    if ((oflags & O_CREAT) && chmod(pathname, mode))
40      {
41      return -1;
42
43diff -a -r -c cmake-2.6.0/Source/kwsys/ProcessUNIX.c cmake-2.6.0-h/Source/kwsys/ProcessUNIX.c
44*** cmake-2.6.0/Source/kwsys/ProcessUNIX.c      Mon May  5 11:25:56 2008
45--- cmake-2.6.0-h/Source/kwsys/ProcessUNIX.c    Fri May  9 17:23:00 2008
46***************
47*** 75,81 ****
48  typedef int kwsysProcess_ssize_t;
49  #endif
50 
51! #if defined(__BEOS__) && !defined(__ZETA__)
52  /* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */
53  # include <be/kernel/OS.h>
54  static inline void kwsysProcess_usleep(unsigned int msec)
55--- 75,81 ----
56  typedef int kwsysProcess_ssize_t;
57  #endif
58 
59! #if defined(__BEOS__) && !defined(__HAIKU__) && !defined(__ZETA__)
60  /* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */
61  # include <be/kernel/OS.h>
62  static inline void kwsysProcess_usleep(unsigned int msec)
63
64
65diff -a -r -c cmake-2.6.0/Source/kwsys/SystemTools.cxx cmake-2.6.0-h/Source/kwsys/SystemTools.cxx
66*** cmake-2.6.0/Source/kwsys/SystemTools.cxx    Mon May  5 11:25:56 2008
67--- cmake-2.6.0-h/Source/kwsys/SystemTools.cxx  Fri May  9 17:00:44 2008
68***************
69*** 131,137 ****
70  #define _chdir chdir
71  #endif
72 
73! #if defined(__BEOS__) && !defined(__ZETA__)
74  #include <be/kernel/OS.h>
75  #include <be/storage/Path.h>
76 
77--- 131,137 ----
78  #define _chdir chdir
79  #endif
80 
81! #if defined(__BEOS__) && !defined(__HAIKU__) && !defined(__ZETA__)
82  #include <be/kernel/OS.h>
83  #include <be/storage/Path.h>
84 
85diff -a -r -c cmake-2.6.0/Source/kwsys/testProcess.c cmake-2.6.0-h/Source/kwsys/testProcess.c
86*** cmake-2.6.0/Source/kwsys/testProcess.c      Mon May  5 11:25:56 2008
87--- cmake-2.6.0-h/Source/kwsys/testProcess.c    Fri May  9 17:25:11 2008
88***************
89*** 34,40 ****
90  # pragma warn -8060 /* possibly incorrect assignment */
91  #endif
92 
93! #if defined(__BEOS__) && !defined(__ZETA__)
94  /* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */
95  # include <be/kernel/OS.h>
96  static inline void testProcess_usleep(unsigned int msec)
97--- 34,40 ----
98  # pragma warn -8060 /* possibly incorrect assignment */
99  #endif
100 
101! #if defined(__BEOS__) && !defined(__HAIKU__) && !defined(__ZETA__)
102  /* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */
103  # include <be/kernel/OS.h>
104  static inline void testProcess_usleep(unsigned int msec)
105
106diff -a -r -c cmake-2.6.0/Utilities/cmtar/libtar.c cmake-2.6.0-h/Utilities/cmtar/libtar.c
107*** cmake-2.6.0/Utilities/cmtar/libtar.c        Mon May  5 11:26:01 2008
108--- cmake-2.6.0-h/Utilities/cmtar/libtar.c      Fri May  9 17:27:07 2008
109***************
110*** 99,105 ****
111      return -1;
112      }
113 
114! #if defined(__BEOS__) && !defined(__ZETA__)  /* no fchmod on BeOS...do pathname instead. */
115    if ((oflags & O_CREAT) && chmod(pathname, mode & 07777))
116      {
117      return -1;
118--- 99,105 ----
119      return -1;
120      }
121 
122! #if defined(__BEOS__) && !defined(__HAIKU__) && !defined(__ZETA__)  /* no fchmod on BeOS...do pathname instead. */
123    if ((oflags & O_CREAT) && chmod(pathname, mode & 07777))
124      {
125      return -1;

Download in other formats:

  • Original Format

Trac Powered

Powered by Trac 0.13dev-r10686
By Edgewall Software.

Visit the Trac open source project at
http://trac.edgewall.org/