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: Superseded
Proposed branch: lp://staging/~mordred/drizzle/various-build-fixes
Merge into: lp://staging/~drizzle-trunk/drizzle/development
Diff against target: 290 lines (+107/-35)
12 files modified
.bzrignore (+1/-0)
client/drizzle.cc (+5/-3)
config/make-lint.py (+1/-0)
drizzled/include.am (+2/-1)
drizzled/message/include.am (+7/-5)
m4/pandora_canonical.m4 (+1/-1)
m4/pandora_drizzle_build.m4 (+1/-0)
m4/pandora_enable_dtrace.m4 (+32/-17)
m4/pandora_have_libboost_options.m4 (+47/-0)
m4/pandora_vc_build.m4 (+6/-4)
plugin/drizzle_protocol/drizzle_protocol.cc (+2/-2)
plugin/mysql_protocol/mysql_protocol.cc (+2/-2)
To merge this branch: bzr merge lp://staging/~mordred/drizzle/various-build-fixes
Reviewer Review Type Date Requested Status
Brian Aker Needs Fixing
Review via email: mp+24722@code.staging.launchpad.net

This proposal supersedes a proposal from 2010-04-23.

This proposal has been superseded by a proposal from 2010-05-06.

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 :

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.

lp://staging/~mordred/drizzle/various-build-fixes updated
1522. By Brian Aker <brian@gaz>

MErge Paul. PBXT only

1523. By Brian Aker <brian@gaz>

Merge joe.

Revision history for this message
Brian Aker (brianaker) wrote :

Build problems (as reported on IRC)

review: Needs Fixing
lp://staging/~mordred/drizzle/various-build-fixes updated
1524. By Brian Aker <brian@gaz>

Merge name changes

Revision history for this message
Monty Taylor (mordred) wrote :

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

lp://staging/~mordred/drizzle/various-build-fixes updated
1525. By Brian Aker <brian@gaz>

Merge for command line app struct conversion

1526. By Brian Aker <brian@gaz>

Merge in modifications to make TableShare and actual object.

Crazy.

1527. By Brian Aker <brian@gaz>

Merge Monty.

1528. By Monty Taylor

Merged in some stuff from pandora-build.

1529. By Monty Taylor

Updated pandora version number.

1530. By Monty Taylor

Enables the disabling of a static plugin at compile time. Incidentally,
fixes all --enable options.

1531. By Monty Taylor

We don't need to wrap this in '.

1532. By Monty Taylor

Wrap the libraries in if BUILD_*_PLUGIN so that they don't build when we're
disabling.

1533. By Monty Taylor

Fixed the --disable-*-plugin not working. It's enablevar - not withvar.

1534. By Monty Taylor

Fix typos.

1535. By Monty Taylor

Fixes stewart's uncleanliness.

1536. By Monty Taylor

Consistent naming would be nice.

1537. By Monty Taylor

typtypoo

1538. By Monty Taylor

Added .quickly file so that we can update things properly.

1539. By Monty Taylor

Added pandora-version.

1540. By Monty Taylor

Updated pandora-build files to version 0.127

Unmerged revisions

1540. By Monty Taylor

Updated pandora-build files to version 0.127

1539. By Monty Taylor

Added pandora-version.

1538. By Monty Taylor

Added .quickly file so that we can update things properly.

1537. By Monty Taylor

typtypoo

1536. By Monty Taylor

Consistent naming would be nice.

1535. By Monty Taylor

Fixes stewart's uncleanliness.

1534. By Monty Taylor

Fix typos.

1533. By Monty Taylor

Fixed the --disable-*-plugin not working. It's enablevar - not withvar.

1532. By Monty Taylor

Wrap the libraries in if BUILD_*_PLUGIN so that they don't build when we're
disabling.

1531. By Monty Taylor

We don't need to wrap this in '.

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.