Merge lp://qastaging/~wibblymat/ubuntu/oneiric/xfe/ftbfs-jam into lp://qastaging/ubuntu/oneiric/xfe
Proposed by
Mat Scales
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 18 | ||||
| Proposed branch: | lp://qastaging/~wibblymat/ubuntu/oneiric/xfe/ftbfs-jam | ||||
| Merge into: | lp://qastaging/ubuntu/oneiric/xfe | ||||
| Diff against target: |
412 lines (+314/-8) 8 files modified
.pc/11_ld-as-needed.patch/configure.ac (+253/-0) .pc/applied-patches (+1/-0) configure.ac (+5/-5) debian/changelog (+7/-0) debian/control (+4/-2) debian/patches/11_ld-as-needed.patch (+42/-0) debian/patches/series (+1/-0) debian/rules (+1/-1) |
||||
| To merge this branch: | bzr merge lp://qastaging/~wibblymat/ubuntu/oneiric/xfe/ftbfs-jam | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Stefano Rivera | Approve | ||
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
Description of the change
Fixes a FTBFS due to linker command line ordering. See: https:/
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
To fix this, the (untested) better solution is to change configure.ac.
LDFLAGS shouldn't contain any "-l"s. Change that LDFLAGS to a LIBS.
Also, where $freetype_libs and others are added to LDFLAGS, they should rather be added to LIBS.
Then add a build-dep on dh-autoreconf, and add "--with autoreconf" to the dh in debian/rules