Merge lp://staging/~peter-pearse/ubuntu/natty/db4.8/prop001 into lp://staging/ubuntu/natty/db4.8

Proposed by Peter Pearse
Status: Superseded
Proposed branch: lp://staging/~peter-pearse/ubuntu/natty/db4.8/prop001
Merge into: lp://staging/ubuntu/natty/db4.8
Diff against target: 130 lines (+44/-13)
2 files modified
debian/changelog (+16/-0)
debian/rules (+28/-13)
To merge this branch: bzr merge lp://staging/~peter-pearse/ubuntu/natty/db4.8/prop001
Reviewer Review Type Date Requested Status
Steve Langasek Approve
Review via email: mp+47656@code.staging.launchpad.net

This proposal has been superseded by a proposal from 2011-01-31.

Description of the change

debian/rules changed:
- Test for java native bindings needs to test DEB_HOST_*, not DEB_BUILD_* against the lists.
- objcopy & strip need to be target host tools.
- Need to pass correct tools to configure.

Note: some packages had to be cross black-listed in xdeb.cfg.

To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) wrote :

+ CONFIGURE_VARS = CC=$(DEB_HOST_GNU_TYPE)-gcc CXX=$(DEB_HOST_GNU_TYPE)-g++ CFLAGS="$(CFLAGS)" CPPFLAGS="-I/usr/$(DEB_HOST_GNU_TYPE)/usr/include/tcl8.5"

This path looks wrong. Shouldn't this be CPPFLAGS="-I/usr/$(DEB_HOST_GNU_TYPE)/include/tcl8.5"? Does something need to be fixed in the tcl8.5 crossing so that this installs to the right place?

Everything else looks spot-on!

review: Needs Fixing
Revision history for this message
Steve Langasek (vorlon) wrote :

(oh, please also fix debian/changelog to point to natty, not maverick)

Revision history for this message
Steve Langasek (vorlon) wrote :

crossing tcl8.5-dev, I see headers installed to /usr/arm-linux-gnueabi/include/tcl8.5/, so I'm pretty sure this just needs fixed here in the db4.8 patch.

Revision history for this message
Peter Pearse (peter-pearse) wrote :

CPPFLAGS corrected, distribution changed to natty.
Re-proposed.

Revision history for this message
Steve Langasek (vorlon) wrote :

found one more instance of DEB_BUILD that needed to be corrected to DEB_HOST; and the --with-tcl arg also needed to be corrected to point to the cross-build directory. Your changes were correct if insufficient, so I'll merge these; please have a look at the result in lp:ubuntu/db4.8 afterwards to see the further changes I've made.

review: Approve
7. By Steve Langasek

Merge from Peter Pearse to fix cross-building

8. By Steve Langasek

fix maintainer field

9. By Steve Langasek

correct one more occurrence of DEB_BUILD vars where DEB_HOST should be used

10. By Steve Langasek

set the tcl path correctly on cross-compile

11. By Clint Adams

Orphan the package.

12. By Colin Watson

Build with -mno-vsx on ppc64, otherwise the tests fail.

13. By Colin Watson

set Maintainer for Ubuntu

14. By Colin Watson

releasing version 4.8.30-5ubuntu1

15. By Steve Langasek

build for multiarch

16. By Steve Langasek

bump dpkg-dev build-dependency for the final multiarch version in Ubuntu

17. By Steve Langasek

releasing version 4.8.30-5ubuntu2

18. By Peter Pearse

No java for cross builds.

Unmerged revisions

18. By Peter Pearse

No java for cross builds.

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: