macosx.patch 4.0 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168
  1. diff -rupN tools/Makefile.suite toolsnew/Makefile.suite
  2. --- tools/Makefile.suite 2012-04-25 11:03:50.000000000 -0700
  3. +++ toolsnew/Makefile.suite 2014-06-25 13:15:00.000000000 -0700
  4. @@ -38,8 +38,8 @@
  5. ################
  6. ## TARGET OS HERE
  7. ################
  8. -# OS Values: AIX, LINUX, SOLARIS, NCR, HPUX
  9. -OS = LINUX
  10. +# OS Values: AIX, LINUX, SOLARIS, NCR, HPUX, OSX
  11. +OS = OSX
  12. ###########
  13. # No changes should be necessary below this point
  14. # Each compile variable is adjusted for the target platform using the OS setting above
  15. @@ -47,7 +47,8 @@ OS = LINUX
  16. # CC
  17. AIX_CC = xlC
  18. HPUX_CC = gcc
  19. -LINUX_CC = gcc
  20. +LINUX_CC = gcc
  21. +OSX_CC = gcc
  22. NCR_CC = cc
  23. SOLARIS_CC = gcc
  24. SOL86_CC = cc
  25. @@ -55,7 +56,8 @@ CC = $($(OS)_CC)
  26. # CFLAGS
  27. AIX_CFLAGS = -q64 -O3 -D_LARGE_FILES
  28. HPUX_CFLAGS = -O3 -Wall
  29. -LINUX_CFLAGS = -g -Wall
  30. +LINUX_CFLAGS = -g -Wall
  31. +OSX_CFLAGS = -g -Wall
  32. NCR_CFLAGS = -g
  33. SOLARIS_CFLAGS = -O3 -Wall
  34. SOL86_CFLAGS = -O3
  35. @@ -65,6 +67,7 @@ CFLAGS = $(BASE_CFLAGS) -D$(OS) $($(OS
  36. AIX_EXE =
  37. HPUX_EXE =
  38. LINUX_EXE =
  39. +OSX_EXE =
  40. NCR_EXE =
  41. SOLARIS_EXE =
  42. SOL86_EXE =
  43. @@ -73,6 +76,7 @@ EXE = $($(OS)_EXE)
  44. AIX_LEX = flex
  45. HPUX_LEX = flex
  46. LINUX_LEX = lex
  47. +OSX_LEX = lex
  48. NCR_LEX = lex
  49. SOLARIS_LEX = lex
  50. SOL86_LEX = lex
  51. @@ -81,6 +85,7 @@ LEX = $($(OS)_LEX)
  52. AIX_LIBS = -lm
  53. HPUX_LIBS = -lm -ll
  54. LINUX_LIBS = -lm
  55. +OSX_LIBS = -lm
  56. NCR_LIBS = -lm -lc89
  57. SOLARIS_LIBS = -ly -ll -lm
  58. SOL86_LIBS = -ly -ll -lm
  59. @@ -89,6 +94,7 @@ LIBS = $($(OS)_LIBS)
  60. AIX_YACC = yacc
  61. HPUX_YACC = bison -y
  62. LINUX_YACC = yacc
  63. +OSX_YACC = yacc
  64. NCR_YACC = yacc
  65. SOLARIS_YACC = yacc
  66. SOL86_YACC = yacc
  67. @@ -97,6 +103,7 @@ YACC = $($(OS)_YACC)
  68. AIX_YFLAGS = -d -v
  69. HPUX_YFLAGS = -y -d -v
  70. LINUX_YFLAGS = -d -v
  71. +OSX_YFLAGS = -d -v
  72. NCR_YFLAGS = -d -v
  73. SOLARIS_YFLAGS = -d -v
  74. SOL86_YFLAGS = -d -v
  75. diff -rupN tools/config.h toolsnew/config.h
  76. --- tools/config.h 2012-04-25 11:03:52.000000000 -0700
  77. +++ toolsnew/config.h 2014-06-25 13:15:00.000000000 -0700
  78. @@ -109,6 +109,18 @@
  79. #define FLEX
  80. #endif /* LINUX */
  81. +#ifdef OSX
  82. +#define SUPPORT_64BITS
  83. +#define HUGE_TYPE int64_t
  84. +#define HUGE_FORMAT "%lld"
  85. +#define HUGE_COUNT 1
  86. +#define USE_STRING_H
  87. +#define USE_LIMITS_H
  88. +#define MAXINT INT_MAX
  89. +#define USE_STDLIB_H
  90. +#define FLEX
  91. +#endif /* OSX */
  92. +
  93. #ifdef SOLARIS
  94. #define SUPPORT_64BITS
  95. #define HUGE_TYPE long long
  96. diff -rupN tools/makefile toolsnew/makefile
  97. --- tools/makefile 2012-04-25 11:03:54.000000000 -0700
  98. +++ toolsnew/makefile 2014-06-25 13:15:00.000000000 -0700
  99. @@ -38,8 +38,8 @@
  100. ################
  101. ## TARGET OS HERE
  102. ################
  103. -# OS Values: AIX, LINUX, SOLARIS, NCR, HPUX
  104. -OS = LINUX
  105. +# OS Values: AIX, LINUX, SOLARIS, NCR, HPUX, OSX
  106. +OS = OSX
  107. ###########
  108. # No changes should be necessary below this point
  109. # Each compile variable is adjusted for the target platform using the OS setting above
  110. @@ -47,7 +47,8 @@ OS = LINUX
  111. # CC
  112. AIX_CC = xlC
  113. HPUX_CC = gcc
  114. -LINUX_CC = gcc
  115. +LINUX_CC = gcc
  116. +OSX_CC = gcc
  117. NCR_CC = cc
  118. SOLARIS_CC = gcc
  119. SOL86_CC = cc
  120. @@ -56,6 +57,7 @@ CC = $($(OS)_CC)
  121. AIX_CFLAGS = -q64 -O3 -D_LARGE_FILES
  122. HPUX_CFLAGS = -O3 -Wall
  123. LINUX_CFLAGS = -g -Wall
  124. +OSX_CFLAGS = -g -Wall -I/usr/include/malloc
  125. NCR_CFLAGS = -g
  126. SOLARIS_CFLAGS = -O3 -Wall
  127. SOL86_CFLAGS = -O3
  128. @@ -65,6 +67,7 @@ CFLAGS = $(BASE_CFLAGS) -D$(OS) $($(OS
  129. AIX_EXE =
  130. HPUX_EXE =
  131. LINUX_EXE =
  132. +OSX_EXE =
  133. NCR_EXE =
  134. SOLARIS_EXE =
  135. SOL86_EXE =
  136. @@ -73,6 +76,7 @@ EXE = $($(OS)_EXE)
  137. AIX_LEX = flex
  138. HPUX_LEX = flex
  139. LINUX_LEX = lex
  140. +OSX_LEX = lex
  141. NCR_LEX = lex
  142. SOLARIS_LEX = lex
  143. SOL86_LEX = lex
  144. @@ -81,6 +85,7 @@ LEX = $($(OS)_LEX)
  145. AIX_LIBS = -lm
  146. HPUX_LIBS = -lm -ll
  147. LINUX_LIBS = -lm
  148. +OSX_LIBS = -lm
  149. NCR_LIBS = -lm -lc89
  150. SOLARIS_LIBS = -ly -ll -lm
  151. SOL86_LIBS = -ly -ll -lm
  152. @@ -89,6 +94,7 @@ LIBS = $($(OS)_LIBS)
  153. AIX_YACC = yacc
  154. HPUX_YACC = bison -y
  155. LINUX_YACC = yacc
  156. +OSX_YACC = yacc
  157. NCR_YACC = yacc
  158. SOLARIS_YACC = yacc
  159. SOL86_YACC = yacc
  160. @@ -97,6 +103,7 @@ YACC = $($(OS)_YACC)
  161. AIX_YFLAGS = -d -v
  162. HPUX_YFLAGS = -y -d -v
  163. LINUX_YFLAGS = -d -v
  164. +OSX_YFLAGS = -d -v
  165. NCR_YFLAGS = -d -v
  166. SOLARIS_YFLAGS = -d -v
  167. SOL86_YFLAGS = -d -v