Merge lp://qastaging/~racb/ubuntu/oneiric/uw-imap/831228 into lp://qastaging/ubuntu/oneiric/uw-imap

Proposed by Robie Basak
Status: Work in progress
Proposed branch: lp://qastaging/~racb/ubuntu/oneiric/uw-imap/831228
Merge into: lp://qastaging/ubuntu/oneiric/uw-imap
Diff against target: 157 lines (+42/-29) (has conflicts)
2 files modified
debian/changelog (+10/-0)
debian/patches/1001_shlibs.patch (+32/-29)
Text conflict in debian/changelog
To merge this branch: bzr merge lp://qastaging/~racb/ubuntu/oneiric/uw-imap/831228
Reviewer Review Type Date Requested Status
Dave Walker Pending
Review via email: mp+74589@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Dave Walker (davewalker) wrote :

Looks good.

Ideally, we'd like to introduce a new patch incase the edited patch isn't accepted by debian, it makes merging easier next cycle.

You probably don't need to quote http://wiki.debian.org/ToolChain/DSOLinking, as it's understood --as-needed is enough.

I need to build test this first, but generally happy. If you are confident this is a good fix, do you want to use the "submittodebian" tool?

Thanks

16. By Robie Basak

Fix libc-client.so.2007e.0 dependencies to build correctly with
-Wl,--as-needed. (LP: #831228)

Revision history for this message
Robie Basak (racb) wrote :

Upstream doesn't appear to support the creation of shared objects in its build system.

The build system does allow a platform specific "ar" call to create static objects by setting a variable. This assumes that the output filename is goes after the contents of the variable.

The Debian package hacks the build system by using a call to gcc as the "ar" call for a new shared object platform type. This ends in "-o" to fulfil the requirement that the output filename will go after it.

This makes it necessary to modify this hack further to move the "-o output_filename" further back to fix the --as-needed bug, so it makes sense to modify the existing Debian patch rather than create a new one. Given that the existing patch is a hack already, I can't see a cleaner way of fixing this except to change more of the upstream build system which would be too invasive. Hopefully Debian will find this acceptable.

Revision history for this message
Colin Watson (cjwatson) wrote :

FWIW it doesn't matter where '-o output_filename' goes; what matters is
the relative positioning of input objects and the libraries they depend
on.

Unmerged revisions

16. By Robie Basak

Fix libc-client.so.2007e.0 dependencies to build correctly with
-Wl,--as-needed. (LP: #831228)

15. By Robie Basak

Fix libc-client.so.2007e.0 dependencies as caused by Ubuntu's
-Wl,--as-needed default.
See: http://wiki.debian.org/ToolChain/DSOLinking (LP: #831228)

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.

Subscribers

People subscribed via source and target branches

to all changes: