1 files changed, 52 insertions, 0 deletions
diff --git a/contrib/packages/deb/ubuntu-trusty/debian/xorg-source-patches/debian_libtool.patch b/contrib/packages/deb/ubuntu-trusty/debian/xorg-source-patches/debian_libtool.patch
new file mode 100644
index 00000000..7be0ba2b
--- /dev/null
+++ b/contrib/packages/deb/ubuntu-trusty/debian/xorg-source-patches/debian_libtool.patch
@@ -0,0 +1,52 @@
+--- a/ltmain.sh	2016-05-11 23:23:25.796742323 -0400
++++ b/ltmain.sh	2016-05-11 23:24:47.173010324 -0400
+@@ -6447,6 +6447,9 @@
+ 	    # It is a libtool convenience library, so add in its objects.
+ 	    func_append convenience " $ladir/$objdir/$old_library"
+ 	    func_append old_convenience " $ladir/$objdir/$old_library"
++	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
++	    func_fatal_error "\`$lib' is not a convenience library"
++	  fi
+ 	    tmp_libs=
+ 	    for deplib in $dependency_libs; do
+ 	      deplibs="$deplib $deplibs"
+@@ -6457,9 +6460,6 @@
+ 	      fi
+ 	      func_append tmp_libs " $deplib"
+ 	    done
+-	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
+-	    func_fatal_error "\`$lib' is not a convenience library"
+-	  fi
+ 	  continue
+ 	fi # $pass = conv
+ 
+--- a/m4/libtool.m4	2016-05-11 23:26:23.801328557 -0400
++++ b/m4/libtool.m4	2016-05-11 23:27:12.701489603 -0400
+@@ -4589,9 +4589,6 @@
+       ;;
+     esac
+     ;;
+-  linux* | k*bsd*-gnu | gnu*)
+-    _LT_TAGVAR(link_all_deplibs, $1)=no
+-    ;;
+   *)
+     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+     ;;
+@@ -4654,9 +4651,6 @@
+   openbsd*)
+     with_gnu_ld=no
+     ;;
+-  linux* | k*bsd*-gnu | gnu*)
+-    _LT_TAGVAR(link_all_deplibs, $1)=no
+-    ;;
+   esac
+ 
+   _LT_TAGVAR(ld_shlibs, $1)=yes
+@@ -5055,7 +5049,6 @@
+ 	if test "$aix_use_runtimelinking" = yes; then
+ 	  shared_flag="$shared_flag "'${wl}-G'
+ 	fi
+-	_LT_TAGVAR(link_all_deplibs, $1)=no
+       else
+ 	# not using gcc
+ 	if test "$host_cpu" = ia64; then