r32918 - in /desktop/unstable/glade/debian: changelog patches/99_ltmain_as-needed.patch

[biebl at users.alioth.debian.org]

Author: biebl
Date: Fri Mar  9 21:28:04 2012
New Revision: 32918

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=32918
Log:
Refresh debian/patches/99_ltmain_as-needed.patch.

Modified:
    desktop/unstable/glade/debian/changelog
    desktop/unstable/glade/debian/patches/99_ltmain_as-needed.patch

Modified: desktop/unstable/glade/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glade/debian/changelog?rev=32918&op=diff
==============================================================================
--- desktop/unstable/glade/debian/changelog [utf-8] (original)
+++ desktop/unstable/glade/debian/changelog [utf-8] Fri Mar  9 21:28:04 2012
@@ -5,8 +5,9 @@
   * Replace python-gobject-dev by python-gi-dev (>= 2.29.4).
   * Bump (Build-)Depends on libgtk-3-dev to (>= 3.2.3).
   * Remove obsolete Conflicts/Replaces.
-
- -- Michael Biebl <biebl at debian.org>  Fri, 09 Mar 2012 21:41:26 +0100
+  * Refresh debian/patches/99_ltmain_as-needed.patch.
+
+ -- Michael Biebl <biebl at debian.org>  Fri, 09 Mar 2012 22:27:42 +0100
 
 glade (3.10.2-1) unstable; urgency=low
 

Modified: desktop/unstable/glade/debian/patches/99_ltmain_as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glade/debian/patches/99_ltmain_as-needed.patch?rev=32918&op=diff
==============================================================================
--- desktop/unstable/glade/debian/patches/99_ltmain_as-needed.patch [utf-8] (original)
+++ desktop/unstable/glade/debian/patches/99_ltmain_as-needed.patch [utf-8] Fri Mar  9 21:28:04 2012
@@ -1,24 +1,25 @@
-Index: glade-3.10.2/ltmain.sh
-===================================================================
---- glade-3.10.2.orig/ltmain.sh	2011-10-11 22:40:44.000000000 +0200
-+++ glade-3.10.2/ltmain.sh	2011-10-20 01:55:33.729709896 +0200
-@@ -5787,6 +5787,11 @@
+Bug-Debian: http://bugs.debian.org/347650
+Last-Update: 2011-06-14
+
+--- a/ltmain.sh
++++ b/ltmain.sh
+@@ -5800,6 +5800,11 @@ func_mode_link ()
  	arg=$func_stripname_result
  	;;
  
-+      -Wl,--as-needed)
++      -Wl,--as-needed|-Wl,--no-as-needed)
 +	deplibs="$deplibs $arg"
 +	continue
 +	;;
-+      
++
        -Wl,*)
  	func_stripname '-Wl,' '' "$arg"
  	args=$func_stripname_result
-@@ -6150,6 +6155,15 @@
+@@ -6163,6 +6168,15 @@ func_mode_link ()
  	lib=
  	found=no
  	case $deplib in
-+	-Wl,--as-needed)
++	-Wl,--as-needed|-Wl,--no-as-needed)
 +	  if test "$linkmode,$pass" = "prog,link"; then
 +	    compile_deplibs="$deplib $compile_deplibs"
 +	    finalize_deplibs="$deplib $finalize_deplibs"
@@ -27,6 +28,6 @@
 +	  fi
 +	  continue
 +	  ;;
- 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+ 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+         |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
  	  if test "$linkmode,$pass" = "prog,link"; then
- 	    compile_deplibs="$deplib $compile_deplibs"