Skip to content
Snippets Groups Projects
Commit 7f12ad74 authored by Iain Lane's avatar Iain Lane
Browse files

Drop ltmain-as-needed patch and do the same with dh_autoreconf --as-needed.

parent fb0885cb
No related branches found
No related tags found
No related merge requests found
gst-plugins-good1.0 (1.2.2-2) UNRELEASED; urgency=medium
* Drop ltmain-as-needed patch and do the same with dh_autoreconf
--as-needed.
-- Iain Lane <laney@debian.org> Thu, 09 Jan 2014 17:20:15 +0000
gst-plugins-good1.0 (1.2.2-1) unstable; urgency=medium
* New upstream bugfix release.
......
diff --git a/ltmain.sh b/ltmain.sh
index c7d06c3..7bc27f2 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -5800,6 +5800,11 @@ func_mode_link ()
arg=$func_stripname_result
;;
+ -Wl,--as-needed)
+ deplibs="$deplibs $arg"
+ continue
+ ;;
+
-Wl,*)
func_stripname '-Wl,' '' "$arg"
args=$func_stripname_result
@@ -6163,6 +6168,15 @@ func_mode_link ()
lib=
found=no
case $deplib in
+ -Wl,--as-needed)
+ if test "$linkmode,$pass" = "prog,link"; then
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ else
+ deplibs="$deplib $deplibs"
+ fi
+ continue
+ ;;
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
|-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
if test "$linkmode,$pass" = "prog,link"; then
99_ltmain_as-needed.patch
......@@ -3,10 +3,10 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/cdbs/1/rules/autoreconf.mk
include /usr/share/cdbs/1/rules/autoreconf.mk
DEB_DH_AUTORECONF_ARGS += --as-needed
# make autoreconf not call libtoolize since we ship a patch for ltmain.sh
export LIBTOOLIZE=true
# make autoreconf not call autopoint since we ship a patch for po/Makefile.in.in
export AUTOPOINT=true
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment