~ubuntu-branches/ubuntu/oneiric/dma/oneiric

« back to all changes in this revision

Viewing changes to debian/patches/42_fix_ftbfs_binutils-gold.patch

  • Committer: Bazaar Package Importer
  • Author(s): Tarun Kumar Mall
  • Date: 2011-03-09 17:46:56 UTC
  • mfrom: (7.2.1 sid)
  • Revision ID: james.westby@ubuntu.com-20110309174656-7s0buxoxvsos8ua1
Tags: 0.0.2010.06.17-10ubuntu1
* Merge from debian unstable.  Remaining changes:
  - Patch 38_fix_ftbfs_binutils-gold.patch imported from previous
    ubuntu version.
  - Patch 38_fix_ftbfs_binutils-gold.patch renamed to
    42_fix_ftbfs_binutils-gold.patch
  - Patch 43_fix_ftbfs_Werror.patch added to fix 
    crypto.c:92:7: error: assignment discards 'const' qualifier 
    from pointer target type [-Werror] "Closes: #622052"

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
Index: dma-0.0.2010.06.17/Makefile.plain
 
2
===================================================================
 
3
--- dma-0.0.2010.06.17.orig/Makefile.plain      2011-03-04 15:11:54.533695997 +0000
 
4
+++ dma-0.0.2010.06.17/Makefile.plain   2011-03-04 15:12:39.645695997 +0000
 
5
@@ -48,4 +48,4 @@
 
6
        ${CC} ${CFLAGS} ${CPPFLAGS} -include dfcompat.h -o $@ -c $<
 
7
 
 
8
 dma: ${OBJS}
 
9
-       ${CC} ${LDFLAGS} ${LDADD} -o $@ ${OBJS}
 
10
+       ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LDADD}