Ubuntu

Merge lp:~kim0/ubuntu/natty/ibmasm-utils/ftbfs-fix into lp:ubuntu/natty/ibmasm-utils

Proposed by Ahmed Kamal on 2010-12-10
Status: Merged
Merged at revision: 11
Proposed branch: lp:~kim0/ubuntu/natty/ibmasm-utils/ftbfs-fix
Merge into: lp:ubuntu/natty/ibmasm-utils
Diff against target: 26 lines (+7/-1) 2 files modified
To merge this branch: bzr merge lp:~kim0/ubuntu/natty/ibmasm-utils/ftbfs-fix
Reviewer Review Type Date Requested Status
Daniel Holbach Approve on 2010-12-13
Ubuntu branches 2010-12-10 Pending
Review via email: mp+43395@code.launchpad.net

Description of the Change

To post a comment you must log in.
Daniel Holbach (dholbach) wrote :

Good work!

review: Approve

Preview Diff

1=== modified file 'debian/changelog'
2--- debian/changelog 2010-10-04 16:35:13 +0000
3+++ debian/changelog 2010-12-10 21:53:14 +0000
4@@ -1,3 +1,9 @@
5+ibmasm-utils (3.0-1ubuntu11) natty; urgency=low
6+
7+ * Reordering gcc linker params, fix linking failure (LP: #687977)
8+
9+ -- Ahmed Kamal <kim0@ubuntu.com> Fri, 10 Dec 2010 23:39:36 +0200
10+
11 ibmasm-utils (3.0-1ubuntu10) natty; urgency=low
12
13 * Only build for x86 based architectures (LP: #651877).
14
15=== modified file 'src/bin/halt/Makefile'
16--- src/bin/halt/Makefile 2008-01-29 11:04:25 +0000
17+++ src/bin/halt/Makefile 2010-12-10 21:53:14 +0000
18@@ -12,7 +12,7 @@
19 install -m 700 $(SPHALT) $(ROOT)/sbin
20
21 $(SPHALT): $(SPHALT).c
22- $(CC) -o $@ $(IBMASM_INC) $(IBMASM_LIB) $@.c
23+ $(CC) $@.c -o $@ $(IBMASM_INC) $(IBMASM_LIB)
24
25 clean:
26 rm -f *.o

Subscribers

People subscribed via source and target branches

to all changes: