Merge lp:~ampelbein/ubuntu/oneiric/klibc/lp-775054 into lp:ubuntu/oneiric/klibc

Proposed by Andreas Moog on 2011-05-01
Status: Merged
Merged at revision: 47
Proposed branch: lp:~ampelbein/ubuntu/oneiric/klibc/lp-775054
Merge into: lp:ubuntu/oneiric/klibc
Diff against target: 40 lines (+9/-2)
3 files modified
debian/changelog (+7/-0)
debian/patches/multiarch-include-path (+1/-1)
klcc/klcc.in (+1/-1)
To merge this branch: bzr merge lp:~ampelbein/ubuntu/oneiric/klibc/lp-775054
Reviewer Review Type Date Requested Status
Colin Watson 2011-05-01 Approve on 2011-05-04
Review via email: mp+59624@code.launchpad.net
To post a comment you must log in.
Colin Watson (cjwatson) wrote :

Looks sensible to me. Thanks for dealing with this.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2011-04-14 12:17:13 +0000
+++ debian/changelog 2011-05-01 18:52:26 +0000
@@ -1,3 +1,10 @@
1klibc (1.5.20-1ubuntu7) oneiric; urgency=low
2
3 * debian/patches/multiarch-include-path: append -I/usr/include/<triplet>
4 instead of -I/usr/lib/klibc/include/<triplet> (LP: #775054)
5
6 -- Andreas Moog <amoog@ubuntu.com> Sun, 01 May 2011 20:30:30 +0200
7
1klibc (1.5.20-1ubuntu6) natty; urgency=low8klibc (1.5.20-1ubuntu6) natty; urgency=low
29
3 * debian/patches/multiarch-include-path: Include the multiarch include10 * debian/patches/multiarch-include-path: Include the multiarch include
411
=== modified file 'debian/patches/multiarch-include-path'
--- debian/patches/multiarch-include-path 2011-04-14 12:17:13 +0000
+++ debian/patches/multiarch-include-path 2011-05-01 18:52:26 +0000
@@ -31,7 +31,7 @@
31 "-I${prefix}/${KCROSS}include");31 "-I${prefix}/${KCROSS}include");
32 32
33+if ($multiarch_path ne '') {33+if ($multiarch_path ne '') {
34+ unshift(@includes, "-I${prefix}/${KCROSS}include/${multiarch_path}");34+ unshift(@includes, "-I/usr/${KCROSS}include/${multiarch_path}");
35+}35+}
36+36+
37 # Default optimization options (for compiles without -g)37 # Default optimization options (for compiles without -g)
3838
=== modified file 'klcc/klcc.in'
--- klcc/klcc.in 2011-04-14 12:17:13 +0000
+++ klcc/klcc.in 2011-05-01 18:52:26 +0000
@@ -8,7 +8,7 @@
8 "-I${prefix}/${KCROSS}include");8 "-I${prefix}/${KCROSS}include");
99
10if ($multiarch_path ne '') {10if ($multiarch_path ne '') {
11 unshift(@includes, "-I${prefix}/${KCROSS}include/${multiarch_path}");11 unshift(@includes, "-I/usr/${KCROSS}include/${multiarch_path}");
12}12}
1313
14# Default optimization options (for compiles without -g)14# Default optimization options (for compiles without -g)

Subscribers

People subscribed via source and target branches

to all changes: