← Back to branch summary

~ubuntu-branches/ubuntu/quantal/devil/quantal

« back to all changes in this revision

Viewing changes to debian/patches/01_fix_as-needed.diff

  • Committer: Bazaar Package Importer
  • Author(s): Bradley Smith
  • Date: 2008-07-23 21:45:53 UTC
  • mfrom: (1.1.1 upstream) (5.1.2 intrepid)
  • Revision ID: james.westby@ubuntu.com-20080723214553-o8629ygxv6d2iijm
Tags: 1.6.8-rc2-3
* Fix typo in 00_misc_fixes.diff.
* Remove broken watch file. Not adding a new one since upstreams
  repository is full of broken versioning.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/01_fix_as-needed.diff
 
1
--- a/libtools/ltmain.sh.orig   2006-03-29 15:45:36.000000000 +0200
 
2
+++ b/libtools/ltmain.sh        2006-03-29 16:39:30.000000000 +0200
 
3
@@ -1754,6 +1754,11 @@
 
4
        arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
 
5
        ;;
 
6
 
 
7
+      -Wl,--as-needed)
 
8
+       deplibs="$deplibs $arg"
 
9
+       continue
 
10
+       ;;
 
11
+      
 
12
       -Wl,*)
 
13
        args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
 
14
        arg=
 
15
@@ -2099,6 +2104,15 @@
 
16
        lib=
 
17
        found=no
 
18
        case $deplib in
 
19
+       -Wl,--as-needed)
 
20
+         if test "$linkmode,$pass" = "prog,link"; then
 
21
+           compile_deplibs="$deplib $compile_deplibs"
 
22
+           finalize_deplibs="$deplib $finalize_deplibs"
 
23
+         else
 
24
+           deplibs="$deplib $deplibs"
 
25
+         fi
 
26
+         continue
 
27
+         ;;
 
28
        -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
 
29
          if test "$linkmode,$pass" = "prog,link"; then
 
30
            compile_deplibs="$deplib $compile_deplibs"