The following commit has been merged in the master branch: commit b460c107135548e11cf45bb2f81cdee9357213b4 Author: Stephane Glondu <st...@glondu.net> Date: Tue May 31 10:20:19 2011 +0200
Rearrange link order to work with 'ld --as-needed' (Closes: #627428) diff --git a/debian/patches/00list b/debian/patches/00list index 26f0bc4..e9bc2c7 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1 +1,2 @@ gcc-4.3.dpatch +ld-as-needed.dpatch diff --git a/debian/patches/ld-as-needed.dpatch b/debian/patches/ld-as-needed.dpatch new file mode 100755 index 0000000..6223dd2 --- /dev/null +++ b/debian/patches/ld-as-needed.dpatch @@ -0,0 +1,35 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## ld-as-needed.dpatch by Colin Watson <cjwat...@ubuntu.com> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: rearrange link order to work with 'ld --as-needed' + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' gmetadom~/src/gdome_cpp_smart/test/Makefile.am gmetadom/src/gdome_cpp_smart/test/Makefile.am +--- gmetadom~/src/gdome_cpp_smart/test/Makefile.am 2007-05-08 16:26:18.000000000 +0100 ++++ gmetadom/src/gdome_cpp_smart/test/Makefile.am 2011-05-20 15:20:07.000000000 +0100 +@@ -6,9 +6,9 @@ + deep_SOURCES = deep.cc + + LDADDS = \ +- $(GDOME_LIBS) \ + $(top_builddir)/src/gdome_cpp_smart/.libs/libgmetadom_gdome_cpp_smart.a \ + $(top_builddir)/src/gdome_cpp_smart/libgmetadom_gdome_cpp_smart.la \ ++ $(GDOME_LIBS) \ + -lstdc++ + + test_LDADD = $(LDADDS) +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' gmetadom~/src/gdome_cpp_smart/test/Makefile.in gmetadom/src/gdome_cpp_smart/test/Makefile.in +--- gmetadom~/src/gdome_cpp_smart/test/Makefile.in 2007-10-15 10:42:44.000000000 +0100 ++++ gmetadom/src/gdome_cpp_smart/test/Makefile.in 2011-05-20 15:20:13.000000000 +0100 +@@ -217,9 +217,9 @@ + basic_SOURCES = basic.cc + deep_SOURCES = deep.cc + LDADDS = \ +- $(GDOME_LIBS) \ + $(top_builddir)/src/gdome_cpp_smart/.libs/libgmetadom_gdome_cpp_smart.a \ + $(top_builddir)/src/gdome_cpp_smart/libgmetadom_gdome_cpp_smart.la \ ++ $(GDOME_LIBS) \ + -lstdc++ + + test_LDADD = $(LDADDS) -- gmetadom packaging _______________________________________________ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits