Drizzle

Merge lp://staging/~mordred/drizzle/various-build-fixes into lp://staging/~drizzle-trunk/drizzle/development

  1. various-build-fixes
  2. Merge into development
Proposed by Monty Taylor
Status: Merged
Merged at revision: 1529
Proposed branch: lp://staging/~mordred/drizzle/various-build-fixes
Merge into: lp://staging/~drizzle-trunk/drizzle/development
Diff against target: 929 lines (+277/-242)
14 files modified
.quickly (+5/-0)
config/autorun.sh (+1/-1)
config/make-lint.py (+3/-0)
config/pandora-plugin (+155/-127)
config/pandora-plugin.ini (+6/-32)
config/uncrustify.cfg (+1/-1)
m4/ac_cxx_header_stdcxx_98.m4 (+22/-6)
m4/acx_pthread.m4 (+68/-73)
m4/pandora_canonical.m4 (+1/-1)
plugin/archive/plugin.am (+2/-0)
plugin/heap/plugin.am (+3/-0)
plugin/innobase/plugin.am (+5/-1)
plugin/myisam/plugin.am (+3/-0)
plugin/pbxt/plugin.am (+2/-0)
To merge this branch: bzr merge lp://staging/~mordred/drizzle/various-build-fixes
Reviewer Review Type Date Requested Status
Stewart Smith Pending
Brian Aker Pending
Review via email: mp+25245@code.staging.launchpad.net

This proposal supersedes a proposal from 2010-05-10.

Description of the change

Fixes several build issues. Also, adds the build requirement on the boost::program_options library.

To post a comment you must log in.
Revision history for this message
Brian Aker (brianaker) wrote : Posted in a previous version of this proposal

Broken on a number of platforms (including FreeBSD).
http://hudson.drizzle.org/view/Drizzle-build/job/drizzle-build-freebsd-8.0/235/console

review: Needs Fixing
Revision history for this message
Monty Taylor (mordred) wrote : Posted in a previous version of this proposal

On 04/30/2010 02:57 PM, Brian Aker wrote:
> Review: Needs Fixing
> Broken on a number of platforms (including FreeBSD).
> http://hudson.drizzle.org/view/Drizzle-build/job/drizzle-build-freebsd-8.0/235/console
>

Weird. I merged up with trunk and re-ran with no problems (well, other
than the usual rabbitmq failure)

http://hudson.drizzle.org/view/Drizzle-param/job/drizzle-param/149/

Specifically freebsd 8.0 is fine here:

http://hudson.drizzle.org/view/Drizzle-param/job/drizzle-param/149/BUILD_TYPE=release,label=freebsd-8.0-amd64/

Perhaps there was a merge weirdness?

Revision history for this message
Monty Taylor (mordred) wrote : Posted in a previous version of this proposal

Merged up with current trunk and re-ran on param-build. All good. This contains the lcov fix and the dtrace fix. Also, this contains the requirement that hosts have libboost_program_options and provides variables so that that work can be happy.

Revision history for this message
Brian Aker (brianaker) wrote : Posted in a previous version of this proposal

Build problems (as reported on IRC)

review: Needs Fixing
Revision history for this message
Monty Taylor (mordred) wrote : Posted in a previous version of this proposal

Found the error on opensolaris. doh. Re-running through param build (esp. now that eric fixed the solaris param-build builders)

Revision history for this message
Monty Taylor (mordred) wrote : Posted in a previous version of this proposal

Ok. Re-ran on param-build, this time including the solaris builders. All seems happy now. Running through valgrind and sysbench,

Revision history for this message
Brian Aker (brianaker) wrote : Posted in a previous version of this proposal

Please tell me when you get this all worked out.

review: Needs Information
Revision history for this message
Monty Taylor (mordred) wrote : Posted in a previous version of this proposal

On 05/07/2010 11:08 AM, Brian Aker wrote:
> Review: Needs Information
> Please tell me when you get this all worked out.

Whoops. Forgot to follow up - valgrind and sysbench both also reported
fine. Good to go.

Revision history for this message
Stewart Smith (stewart) wrote : Posted in a previous version of this proposal

With this branch, we can have innobase or embedded_innodb builds.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.