Merge lp:~mordred/drizzle/merge-pandora-build into lp:drizzle/7.0
- merge-pandora-build
- Merge into 7.0
Proposed by
Monty Taylor
Status: | Merged |
---|---|
Approved by: | Monty Taylor |
Approved revision: | 2027 |
Merge reported by: | Monty Taylor |
Merged at revision: | not available |
Proposed branch: | lp:~mordred/drizzle/merge-pandora-build |
Merge into: | lp:drizzle/7.0 |
Diff against target: |
409 lines (+21/-280) 6 files modified
.quickly (+1/-1) m4/acx_pthread.m4 (+0/-271) m4/pandora_canonical.m4 (+14/-5) m4/pandora_vc_build.m4 (+3/-1) m4/pandora_visibility.m4 (+1/-2) m4/pandora_warnings.m4 (+2/-0) |
To merge this branch: | bzr merge lp:~mordred/drizzle/merge-pandora-build |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Lee Bieber (community) | Needs Fixing | ||
Review via email: mp+44647@code.launchpad.net |
Commit message
Description of the change
Sucked in latest few changes from pandora- this supports the innodb-cxx branch.
To post a comment you must log in.
Revision history for this message
Lee Bieber (kalebral-deactivatedaccount) wrote : | # |
review:
Needs Fixing
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file '.quickly' | |||
2 | --- .quickly 2010-12-15 18:49:42 +0000 | |||
3 | +++ .quickly 2010-12-24 07:11:12 +0000 | |||
4 | @@ -2,4 +2,4 @@ | |||
5 | 2 | version = 0.4.2 | 2 | version = 0.4.2 |
6 | 3 | template = pandora-build | 3 | template = pandora-build |
7 | 4 | project-type = application | 4 | project-type = application |
9 | 5 | pandora-version = 0.163 | 5 | pandora-version = 0.169 |
10 | 6 | 6 | ||
11 | === removed file 'm4/acx_pthread.m4' | |||
12 | --- m4/acx_pthread.m4 2010-12-18 04:43:40 +0000 | |||
13 | +++ m4/acx_pthread.m4 1970-01-01 00:00:00 +0000 | |||
14 | @@ -1,271 +0,0 @@ | |||
15 | 1 | # =========================================================================== | ||
16 | 2 | # http://autoconf-archive.cryp.to/acx_pthread.html | ||
17 | 3 | # =========================================================================== | ||
18 | 4 | # | ||
19 | 5 | # SYNOPSIS | ||
20 | 6 | # | ||
21 | 7 | # ACX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) | ||
22 | 8 | # | ||
23 | 9 | # DESCRIPTION | ||
24 | 10 | # | ||
25 | 11 | # This macro figures out how to build C programs using POSIX threads. It | ||
26 | 12 | # sets the PTHREAD_LIBS output variable to the threads library and linker | ||
27 | 13 | # flags, and the PTHREAD_CFLAGS output variable to any special C compiler | ||
28 | 14 | # flags that are needed. (The user can also force certain compiler | ||
29 | 15 | # flags/libs to be tested by setting these environment variables.) | ||
30 | 16 | # | ||
31 | 17 | # Also sets PTHREAD_CC to any special C compiler that is needed for | ||
32 | 18 | # multi-threaded programs (defaults to the value of CC otherwise). (This | ||
33 | 19 | # is necessary on AIX to use the special cc_r compiler alias.) | ||
34 | 20 | # | ||
35 | 21 | # NOTE: You are assumed to not only compile your program with these flags, | ||
36 | 22 | # but also link it with them as well. e.g. you should link with | ||
37 | 23 | # $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS | ||
38 | 24 | # | ||
39 | 25 | # If you are only building threads programs, you may wish to use these | ||
40 | 26 | # variables in your default LIBS, CFLAGS, and CC: | ||
41 | 27 | # | ||
42 | 28 | # LIBS="$PTHREAD_LIBS $LIBS" | ||
43 | 29 | # CFLAGS="$CFLAGS $PTHREAD_CFLAGS" | ||
44 | 30 | # CC="$PTHREAD_CC" | ||
45 | 31 | # | ||
46 | 32 | # In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant | ||
47 | 33 | # has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name | ||
48 | 34 | # (e.g. PTHREAD_CREATE_UNDETACHED on AIX). | ||
49 | 35 | # | ||
50 | 36 | # ACTION-IF-FOUND is a list of shell commands to run if a threads library | ||
51 | 37 | # is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it | ||
52 | 38 | # is not found. If ACTION-IF-FOUND is not specified, the default action | ||
53 | 39 | # will define HAVE_PTHREAD. | ||
54 | 40 | # | ||
55 | 41 | # Please let the authors know if this macro fails on any platform, or if | ||
56 | 42 | # you have any other suggestions or comments. This macro was based on work | ||
57 | 43 | # by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help | ||
58 | 44 | # from M. Frigo), as well as ac_pthread and hb_pthread macros posted by | ||
59 | 45 | # Alejandro Forero Cuervo to the autoconf macro repository. We are also | ||
60 | 46 | # grateful for the helpful feedback of numerous users. | ||
61 | 47 | # | ||
62 | 48 | # LICENSE | ||
63 | 49 | # | ||
64 | 50 | # Copyright (C) 2008 Steven G. Johnson <stevenj@alum.mit.edu> | ||
65 | 51 | # | ||
66 | 52 | # This program is free software: you can redistribute it and/or modify it | ||
67 | 53 | # under the terms of the GNU General Public License as published by the | ||
68 | 54 | # Free Software Foundation, either version 3 of the License, or (at your | ||
69 | 55 | # option) any later version. | ||
70 | 56 | # | ||
71 | 57 | # This program is distributed in the hope that it will be useful, but | ||
72 | 58 | # WITHOUT ANY WARRANTY; without even the implied warranty of | ||
73 | 59 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General | ||
74 | 60 | # Public License for more details. | ||
75 | 61 | # | ||
76 | 62 | # You should have received a copy of the GNU General Public License along | ||
77 | 63 | # with this program. If not, see <http://www.gnu.org/licenses/>. | ||
78 | 64 | # | ||
79 | 65 | # As a special exception, the respective Autoconf Macro's copyright owner | ||
80 | 66 | # gives unlimited permission to copy, distribute and modify the configure | ||
81 | 67 | # scripts that are the output of Autoconf when processing the Macro. You | ||
82 | 68 | # need not follow the terms of the GNU General Public License when using | ||
83 | 69 | # or distributing such scripts, even though portions of the text of the | ||
84 | 70 | # Macro appear in them. The GNU General Public License (GPL) does govern | ||
85 | 71 | # all other use of the material that constitutes the Autoconf Macro. | ||
86 | 72 | # | ||
87 | 73 | # This special exception to the GPL applies to versions of the Autoconf | ||
88 | 74 | # Macro released by the Autoconf Archive. When you make and distribute a | ||
89 | 75 | # modified version of the Autoconf Macro, you may extend this special | ||
90 | 76 | # exception to the GPL to apply to your modified version as well. | ||
91 | 77 | |||
92 | 78 | AC_DEFUN([ACX_PTHREAD], [ | ||
93 | 79 | AC_REQUIRE([AC_CANONICAL_HOST]) | ||
94 | 80 | AC_LANG_SAVE | ||
95 | 81 | AC_LANG_C | ||
96 | 82 | acx_pthread_ok=no | ||
97 | 83 | |||
98 | 84 | # We used to check for pthread.h first, but this fails if pthread.h | ||
99 | 85 | # requires special compiler flags (e.g. on True64 or Sequent). | ||
100 | 86 | # It gets checked for in the link test anyway. | ||
101 | 87 | |||
102 | 88 | # First of all, check if the user has set any of the PTHREAD_LIBS, | ||
103 | 89 | # etcetera environment variables, and if threads linking works using | ||
104 | 90 | # them: | ||
105 | 91 | if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then | ||
106 | 92 | save_CFLAGS="$CFLAGS" | ||
107 | 93 | CFLAGS="$CFLAGS $PTHREAD_CFLAGS" | ||
108 | 94 | save_LIBS="$LIBS" | ||
109 | 95 | LIBS="$PTHREAD_LIBS $LIBS" | ||
110 | 96 | AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS]) | ||
111 | 97 | AC_TRY_LINK_FUNC(pthread_join, acx_pthread_ok=yes) | ||
112 | 98 | AC_MSG_RESULT($acx_pthread_ok) | ||
113 | 99 | if test x"$acx_pthread_ok" = xno; then | ||
114 | 100 | PTHREAD_LIBS="" | ||
115 | 101 | PTHREAD_CFLAGS="" | ||
116 | 102 | fi | ||
117 | 103 | LIBS="$save_LIBS" | ||
118 | 104 | CFLAGS="$save_CFLAGS" | ||
119 | 105 | fi | ||
120 | 106 | |||
121 | 107 | # We must check for the threads library under a number of different | ||
122 | 108 | # names; the ordering is very important because some systems | ||
123 | 109 | # (e.g. DEC) have both -lpthread and -lpthreads, where one of the | ||
124 | 110 | # libraries is broken (non-POSIX). | ||
125 | 111 | |||
126 | 112 | # Create a list of thread flags to try. Items starting with a "-" are | ||
127 | 113 | # C compiler flags, and other items are library names, except for "none" | ||
128 | 114 | # which indicates that we try without any flags at all, and "pthread-config" | ||
129 | 115 | # which is a program returning the flags for the Pth emulation library. | ||
130 | 116 | |||
131 | 117 | acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" | ||
132 | 118 | |||
133 | 119 | # The ordering *is* (sometimes) important. Some notes on the | ||
134 | 120 | # individual items follow: | ||
135 | 121 | |||
136 | 122 | # pthreads: AIX (must check this before -lpthread) | ||
137 | 123 | # none: in case threads are in libc; should be tried before -Kthread and | ||
138 | 124 | # other compiler flags to prevent continual compiler warnings | ||
139 | 125 | # -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h) | ||
140 | 126 | # -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) | ||
141 | 127 | # lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) | ||
142 | 128 | # -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads) | ||
143 | 129 | # -pthreads: Solaris/gcc | ||
144 | 130 | # -mthreads: Mingw32/gcc, Lynx/gcc | ||
145 | 131 | # -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it | ||
146 | 132 | # doesn't hurt to check since this sometimes defines pthreads too; | ||
147 | 133 | # also defines -D_REENTRANT) | ||
148 | 134 | # ... -mt is also the pthreads flag for HP/aCC | ||
149 | 135 | # pthread: Linux, etcetera | ||
150 | 136 | # --thread-safe: KAI C++ | ||
151 | 137 | # pthread-config: use pthread-config program (for GNU Pth library) | ||
152 | 138 | |||
153 | 139 | case "${host_cpu}-${host_os}" in | ||
154 | 140 | *solaris*) | ||
155 | 141 | |||
156 | 142 | # On Solaris (at least, for some versions), libc contains stubbed | ||
157 | 143 | # (non-functional) versions of the pthreads routines, so link-based | ||
158 | 144 | # tests will erroneously succeed. (We need to link with -pthreads/-mt/ | ||
159 | 145 | # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather | ||
160 | 146 | # a function called by this macro, so we could check for that, but | ||
161 | 147 | # who knows whether they'll stub that too in a future libc.) So, | ||
162 | 148 | # we'll just look for -pthreads and -lpthread first: | ||
163 | 149 | |||
164 | 150 | acx_pthread_flags="-pthreads pthread -mt -pthread $acx_pthread_flags" | ||
165 | 151 | ;; | ||
166 | 152 | esac | ||
167 | 153 | |||
168 | 154 | if test x"$acx_pthread_ok" = xno; then | ||
169 | 155 | for flag in $acx_pthread_flags; do | ||
170 | 156 | |||
171 | 157 | case $flag in | ||
172 | 158 | none) | ||
173 | 159 | AC_MSG_CHECKING([whether pthreads work without any flags]) | ||
174 | 160 | ;; | ||
175 | 161 | |||
176 | 162 | -*) | ||
177 | 163 | AC_MSG_CHECKING([whether pthreads work with $flag]) | ||
178 | 164 | PTHREAD_CFLAGS="$flag" | ||
179 | 165 | ;; | ||
180 | 166 | |||
181 | 167 | pthread-config) | ||
182 | 168 | AC_CHECK_PROG(acx_pthread_config, pthread-config, yes, no) | ||
183 | 169 | if test x"$acx_pthread_config" = xno; then continue; fi | ||
184 | 170 | PTHREAD_CFLAGS="`pthread-config --cflags`" | ||
185 | 171 | PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" | ||
186 | 172 | ;; | ||
187 | 173 | |||
188 | 174 | *) | ||
189 | 175 | AC_MSG_CHECKING([for the pthreads library -l$flag]) | ||
190 | 176 | PTHREAD_LIBS="-l$flag" | ||
191 | 177 | ;; | ||
192 | 178 | esac | ||
193 | 179 | |||
194 | 180 | save_LIBS="$LIBS" | ||
195 | 181 | save_CFLAGS="$CFLAGS" | ||
196 | 182 | LIBS="$PTHREAD_LIBS $LIBS" | ||
197 | 183 | CFLAGS="$CFLAGS $PTHREAD_CFLAGS" | ||
198 | 184 | |||
199 | 185 | # Check for various functions. We must include pthread.h, | ||
200 | 186 | # since some functions may be macros. (On the Sequent, we | ||
201 | 187 | # need a special flag -Kthread to make this header compile.) | ||
202 | 188 | # We check for pthread_join because it is in -lpthread on IRIX | ||
203 | 189 | # while pthread_create is in libc. We check for pthread_attr_init | ||
204 | 190 | # due to DEC craziness with -lpthreads. We check for | ||
205 | 191 | # pthread_cleanup_push because it is one of the few pthread | ||
206 | 192 | # functions on Solaris that doesn't have a non-functional libc stub. | ||
207 | 193 | # We try pthread_create on general principles. | ||
208 | 194 | AC_TRY_LINK([#include <pthread.h>], | ||
209 | 195 | [pthread_t th; pthread_join(th, 0); | ||
210 | 196 | pthread_attr_init(0); pthread_cleanup_push(0, 0); | ||
211 | 197 | pthread_create(0,0,0,0); pthread_cleanup_pop(0); ], | ||
212 | 198 | [acx_pthread_ok=yes]) | ||
213 | 199 | |||
214 | 200 | LIBS="$save_LIBS" | ||
215 | 201 | CFLAGS="$save_CFLAGS" | ||
216 | 202 | |||
217 | 203 | AC_MSG_RESULT($acx_pthread_ok) | ||
218 | 204 | if test "x$acx_pthread_ok" = xyes; then | ||
219 | 205 | break; | ||
220 | 206 | fi | ||
221 | 207 | |||
222 | 208 | PTHREAD_LIBS="" | ||
223 | 209 | PTHREAD_CFLAGS="" | ||
224 | 210 | done | ||
225 | 211 | fi | ||
226 | 212 | |||
227 | 213 | # Various other checks: | ||
228 | 214 | if test "x$acx_pthread_ok" = xyes; then | ||
229 | 215 | save_LIBS="$LIBS" | ||
230 | 216 | LIBS="$PTHREAD_LIBS $LIBS" | ||
231 | 217 | save_CFLAGS="$CFLAGS" | ||
232 | 218 | CFLAGS="$CFLAGS $PTHREAD_CFLAGS" | ||
233 | 219 | |||
234 | 220 | # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. | ||
235 | 221 | AC_MSG_CHECKING([for joinable pthread attribute]) | ||
236 | 222 | attr_name=unknown | ||
237 | 223 | for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do | ||
238 | 224 | AC_TRY_LINK([#include <pthread.h>], [int attr=$attr; return attr;], | ||
239 | 225 | [attr_name=$attr; break]) | ||
240 | 226 | done | ||
241 | 227 | AC_MSG_RESULT($attr_name) | ||
242 | 228 | if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then | ||
243 | 229 | AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name, | ||
244 | 230 | [Define to necessary symbol if this constant | ||
245 | 231 | uses a non-standard name on your system.]) | ||
246 | 232 | fi | ||
247 | 233 | |||
248 | 234 | AC_MSG_CHECKING([if more special flags are required for pthreads]) | ||
249 | 235 | flag=no | ||
250 | 236 | case "${host_cpu}-${host_os}" in | ||
251 | 237 | *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";; | ||
252 | 238 | *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";; | ||
253 | 239 | esac | ||
254 | 240 | AC_MSG_RESULT(${flag}) | ||
255 | 241 | if test "x$flag" != xno; then | ||
256 | 242 | PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" | ||
257 | 243 | fi | ||
258 | 244 | |||
259 | 245 | LIBS="$save_LIBS" | ||
260 | 246 | CFLAGS="$save_CFLAGS" | ||
261 | 247 | |||
262 | 248 | # More AIX lossage: must compile with xlc_r or cc_r | ||
263 | 249 | if test x"$GCC" != xyes; then | ||
264 | 250 | AC_CHECK_PROGS(PTHREAD_CC, xlc_r cc_r, ${CC}) | ||
265 | 251 | else | ||
266 | 252 | PTHREAD_CC=$CC | ||
267 | 253 | fi | ||
268 | 254 | else | ||
269 | 255 | PTHREAD_CC="$CC" | ||
270 | 256 | fi | ||
271 | 257 | |||
272 | 258 | AC_SUBST(PTHREAD_LIBS) | ||
273 | 259 | AC_SUBST(PTHREAD_CFLAGS) | ||
274 | 260 | AC_SUBST(PTHREAD_CC) | ||
275 | 261 | |||
276 | 262 | # Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: | ||
277 | 263 | if test x"$acx_pthread_ok" = xyes; then | ||
278 | 264 | ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1]) | ||
279 | 265 | : | ||
280 | 266 | else | ||
281 | 267 | acx_pthread_ok=no | ||
282 | 268 | $2 | ||
283 | 269 | fi | ||
284 | 270 | AC_LANG_RESTORE | ||
285 | 271 | ])dnl ACX_PTHREAD | ||
286 | 272 | 0 | ||
287 | === modified file 'm4/pandora_canonical.m4' | |||
288 | --- m4/pandora_canonical.m4 2010-12-19 16:20:13 +0000 | |||
289 | +++ m4/pandora_canonical.m4 2010-12-24 07:11:12 +0000 | |||
290 | @@ -4,7 +4,7 @@ | |||
291 | 4 | dnl with or without modifications, as long as this notice is preserved. | 4 | dnl with or without modifications, as long as this notice is preserved. |
292 | 5 | 5 | ||
293 | 6 | dnl Which version of the canonical setup we're using | 6 | dnl Which version of the canonical setup we're using |
295 | 7 | AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.163]) | 7 | AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.169]) |
296 | 8 | 8 | ||
297 | 9 | AC_DEFUN([PANDORA_FORCE_DEPEND_TRACKING],[ | 9 | AC_DEFUN([PANDORA_FORCE_DEPEND_TRACKING],[ |
298 | 10 | AC_ARG_ENABLE([fat-binaries], | 10 | AC_ARG_ENABLE([fat-binaries], |
299 | @@ -38,6 +38,7 @@ | |||
300 | 38 | m4_define([PCT_REQUIRE_CXX],[no]) | 38 | m4_define([PCT_REQUIRE_CXX],[no]) |
301 | 39 | m4_define([PCT_FORCE_GCC42],[no]) | 39 | m4_define([PCT_FORCE_GCC42],[no]) |
302 | 40 | m4_define([PCT_DONT_SUPPRESS_INCLUDE],[no]) | 40 | m4_define([PCT_DONT_SUPPRESS_INCLUDE],[no]) |
303 | 41 | m4_define([PCT_NO_VC_CHANGELOG],[no]) | ||
304 | 41 | m4_define([PCT_VERSION_FROM_VC],[no]) | 42 | m4_define([PCT_VERSION_FROM_VC],[no]) |
305 | 42 | m4_define([PCT_USE_VISIBILITY],[yes]) | 43 | m4_define([PCT_USE_VISIBILITY],[yes]) |
306 | 43 | m4_foreach([pct_arg],[$*],[ | 44 | m4_foreach([pct_arg],[$*],[ |
307 | @@ -58,6 +59,10 @@ | |||
308 | 58 | m4_undefine([PCT_DONT_SUPPRESS_INCLUDE]) | 59 | m4_undefine([PCT_DONT_SUPPRESS_INCLUDE]) |
309 | 59 | m4_define([PCT_DONT_SUPPRESS_INCLUDE],[yes]) | 60 | m4_define([PCT_DONT_SUPPRESS_INCLUDE],[yes]) |
310 | 60 | ], | 61 | ], |
311 | 62 | [no-vc-changelog], [ | ||
312 | 63 | m4_undefine([PCT_NO_VC_CHANGELOG]) | ||
313 | 64 | m4_define([PCT_NO_VC_CHANGELOG],[yes]) | ||
314 | 65 | ], | ||
315 | 61 | [version-from-vc], [ | 66 | [version-from-vc], [ |
316 | 62 | m4_undefine([PCT_VERSION_FROM_VC]) | 67 | m4_undefine([PCT_VERSION_FROM_VC]) |
317 | 63 | m4_define([PCT_VERSION_FROM_VC],[yes]) | 68 | m4_define([PCT_VERSION_FROM_VC],[yes]) |
318 | @@ -104,6 +109,11 @@ | |||
319 | 104 | ]) | 109 | ]) |
320 | 105 | AC_REQUIRE([PANDORA_64BIT]) | 110 | AC_REQUIRE([PANDORA_64BIT]) |
321 | 106 | 111 | ||
322 | 112 | m4_if(PCT_NO_VC_CHANGELOG,yes,[ | ||
323 | 113 | vc_changelog=no | ||
324 | 114 | ],[ | ||
325 | 115 | vc_changelog=yes | ||
326 | 116 | ]) | ||
327 | 107 | m4_if(PCT_VERSION_FROM_VC,yes,[ | 117 | m4_if(PCT_VERSION_FROM_VC,yes,[ |
328 | 108 | PANDORA_VC_VERSION | 118 | PANDORA_VC_VERSION |
329 | 109 | ],[ | 119 | ],[ |
330 | @@ -244,12 +254,10 @@ | |||
331 | 244 | 254 | ||
332 | 245 | PANDORA_HAVE_GCC_ATOMICS | 255 | PANDORA_HAVE_GCC_ATOMICS |
333 | 246 | 256 | ||
334 | 247 | save_CFLAGS="${CFLAGS}" | ||
335 | 248 | CFLAGS="${CFLAGS} -Werror" | ||
336 | 249 | PANDORA_CHECK_VISIBILITY | ||
337 | 250 | CFLAGS="${save_CFLAGS}" | ||
338 | 251 | m4_if(PCT_USE_VISIBILITY,[yes],[ | 257 | m4_if(PCT_USE_VISIBILITY,[yes],[ |
339 | 252 | PANDORA_ENABLE_VISIBILITY | 258 | PANDORA_ENABLE_VISIBILITY |
340 | 259 | ],[ | ||
341 | 260 | PANDORA_CHECK_VISIBILITY | ||
342 | 253 | ]) | 261 | ]) |
343 | 254 | 262 | ||
344 | 255 | PANDORA_HEADER_ASSERT | 263 | PANDORA_HEADER_ASSERT |
345 | @@ -347,6 +355,7 @@ | |||
346 | 347 | #endif | 355 | #endif |
347 | 348 | 356 | ||
348 | 349 | #if !defined(HAVE_ULONG) && !defined(__USE_MISC) | 357 | #if !defined(HAVE_ULONG) && !defined(__USE_MISC) |
349 | 358 | # define HAVE_ULONG 1 | ||
350 | 350 | typedef unsigned long int ulong; | 359 | typedef unsigned long int ulong; |
351 | 351 | #endif | 360 | #endif |
352 | 352 | 361 | ||
353 | 353 | 362 | ||
354 | === renamed file 'm4/ac_cxx_compile_stdcxx_0x.m4' => 'm4/pandora_compile_stdcxx_0x.m4' | |||
355 | === renamed file 'm4/ac_cxx_header_stdcxx_98.m4' => 'm4/pandora_header_stdcxx_98.m4' | |||
356 | === modified file 'm4/pandora_vc_build.m4' | |||
357 | --- m4/pandora_vc_build.m4 2010-12-18 04:43:40 +0000 | |||
358 | +++ m4/pandora_vc_build.m4 2010-12-24 07:11:12 +0000 | |||
359 | @@ -53,7 +53,9 @@ | |||
360 | 53 | PANDORA_VC_REVNO="${PANDORA_BZR_REVNO}" | 53 | PANDORA_VC_REVNO="${PANDORA_BZR_REVNO}" |
361 | 54 | PANDORA_VC_REVID=`bzr log -r-1 --show-ids | grep revision-id | cut -f2 -d' ' | head -1` | 54 | PANDORA_VC_REVID=`bzr log -r-1 --show-ids | grep revision-id | cut -f2 -d' ' | head -1` |
362 | 55 | PANDORA_VC_BRANCH=`bzr nick` | 55 | PANDORA_VC_BRANCH=`bzr nick` |
364 | 56 | bzr log --gnu > ChangeLog | 56 | if test "x${vcs_changelog}" = "xyes"; then |
365 | 57 | bzr log --gnu > ChangeLog | ||
366 | 58 | fi | ||
367 | 57 | fi | 59 | fi |
368 | 58 | fi | 60 | fi |
369 | 59 | 61 | ||
370 | 60 | 62 | ||
371 | === modified file 'm4/pandora_visibility.m4' | |||
372 | --- m4/pandora_visibility.m4 2010-08-21 03:34:31 +0000 | |||
373 | +++ m4/pandora_visibility.m4 2010-12-24 07:11:12 +0000 | |||
374 | @@ -23,14 +23,13 @@ | |||
375 | 23 | AC_DEFUN([PANDORA_CHECK_VISIBILITY], | 23 | AC_DEFUN([PANDORA_CHECK_VISIBILITY], |
376 | 24 | [ | 24 | [ |
377 | 25 | AC_REQUIRE([AC_PROG_CC]) | 25 | AC_REQUIRE([AC_PROG_CC]) |
378 | 26 | AC_REQUIRE([PANDORA_PLATFORM]) | ||
379 | 27 | CFLAG_VISIBILITY= | 26 | CFLAG_VISIBILITY= |
380 | 28 | HAVE_VISIBILITY=0 | 27 | HAVE_VISIBILITY=0 |
381 | 29 | AS_IF([test -n "$GCC"],[ | 28 | AS_IF([test -n "$GCC"],[ |
382 | 30 | AC_MSG_CHECKING([for simple visibility declarations]) | 29 | AC_MSG_CHECKING([for simple visibility declarations]) |
383 | 31 | AC_CACHE_VAL([gl_cv_cc_visibility], [ | 30 | AC_CACHE_VAL([gl_cv_cc_visibility], [ |
384 | 32 | gl_save_CFLAGS="$CFLAGS" | 31 | gl_save_CFLAGS="$CFLAGS" |
386 | 33 | CFLAGS="$CFLAGS -fvisibility=hidden" | 32 | CFLAGS="$CFLAGS -fvisibility=hidden -Werror" |
387 | 34 | AC_TRY_COMPILE( | 33 | AC_TRY_COMPILE( |
388 | 35 | [extern __attribute__((__visibility__("hidden"))) int hiddenvar; | 34 | [extern __attribute__((__visibility__("hidden"))) int hiddenvar; |
389 | 36 | extern __attribute__((__visibility__("default"))) int exportedvar; | 35 | extern __attribute__((__visibility__("default"))) int exportedvar; |
390 | 37 | 36 | ||
391 | === modified file 'm4/pandora_warnings.m4' | |||
392 | --- m4/pandora_warnings.m4 2010-12-19 16:20:13 +0000 | |||
393 | +++ m4/pandora_warnings.m4 2010-12-24 07:11:12 +0000 | |||
394 | @@ -372,6 +372,7 @@ | |||
395 | 372 | PROTOSKIP_WARNINGS="-Wno-effc++ -Wno-shadow -Wno-missing-braces ${NO_ATTRIBUTES}" | 372 | PROTOSKIP_WARNINGS="-Wno-effc++ -Wno-shadow -Wno-missing-braces ${NO_ATTRIBUTES}" |
396 | 373 | NO_WERROR="-Wno-error" | 373 | NO_WERROR="-Wno-error" |
397 | 374 | INNOBASE_SKIP_WARNINGS="-Wno-shadow -Wno-cast-align" | 374 | INNOBASE_SKIP_WARNINGS="-Wno-shadow -Wno-cast-align" |
398 | 375 | PERMISSIVE_WARNINGS="-Wno-error -fpermissive" | ||
399 | 375 | AS_IF([test "$host_vendor" = "apple"],[ | 376 | AS_IF([test "$host_vendor" = "apple"],[ |
400 | 376 | BOOSTSKIP_WARNINGS="-Wno-uninitialized" | 377 | BOOSTSKIP_WARNINGS="-Wno-uninitialized" |
401 | 377 | ]) | 378 | ]) |
402 | @@ -430,6 +431,7 @@ | |||
403 | 430 | AC_SUBST(NO_OLD_STYLE_CAST) | 431 | AC_SUBST(NO_OLD_STYLE_CAST) |
404 | 431 | AC_SUBST(PROTOSKIP_WARNINGS) | 432 | AC_SUBST(PROTOSKIP_WARNINGS) |
405 | 432 | AC_SUBST(BOOSTSKIP_WARNINGS) | 433 | AC_SUBST(BOOSTSKIP_WARNINGS) |
406 | 434 | AC_SUBST(PERMISSIVE_WARNINGS) | ||
407 | 433 | AC_SUBST(INNOBASE_SKIP_WARNINGS) | 435 | AC_SUBST(INNOBASE_SKIP_WARNINGS) |
408 | 434 | AC_SUBST(NO_WERROR) | 436 | AC_SUBST(NO_WERROR) |
409 | 435 | AC_SUBST([GCOV_LIBS]) | 437 | AC_SUBST([GCOV_LIBS]) |
Doesn't build on Solaris- http:// hudson. drizzle. org/view/ Drizzle- param/job/ drizzle- param-solaris10 -sparc/ 20/console