diff --git a/debian/changelog b/debian/changelog index 87269e03..ecd7b6ac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ libgtop2 (2.28.5-1) UNRELEASED; urgency=low * New upstream release. * Remove those kfreebsd patches which have been merged upstream. + * Drop 99_ltmain_as-needed.patch and use dh_autoreconf --as-needed instead. -- Michael Biebl Thu, 05 Sep 2013 02:37:50 +0200 diff --git a/debian/patches/99_ltmain_as-needed.patch b/debian/patches/99_ltmain_as-needed.patch deleted file mode 100644 index 705870c9..00000000 --- a/debian/patches/99_ltmain_as-needed.patch +++ /dev/null @@ -1,32 +0,0 @@ -Index: libgtop2/ltmain.sh -=================================================================== ---- libgtop2.orig/ltmain.sh 2011-08-30 13:25:39.000000000 +0200 -+++ libgtop2/ltmain.sh 2011-09-06 14:12:45.695875002 +0200 -@@ -5787,6 +5787,11 @@ - arg=$func_stripname_result - ;; - -+ -Wl,--as-needed) -+ deplibs="$deplibs $arg" -+ continue -+ ;; -+ - -Wl,*) - func_stripname '-Wl,' '' "$arg" - args=$func_stripname_result -@@ -6150,6 +6155,15 @@ - 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) - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" diff --git a/debian/patches/series b/debian/patches/series index 7a4bee1d..a9baa102 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ 02_hurd_stub_backend.patch 03_kfreebsd_installdirs.patch 06_kfreebsd_sys_pipe.patch -99_ltmain_as-needed.patch diff --git a/debian/rules b/debian/rules index f80e878a..a7024411 100755 --- a/debian/rules +++ b/debian/rules @@ -12,6 +12,9 @@ GNOME_MODULE := libgtop SHARED_PKG := libgtop2-7 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed + +DEB_DH_AUTORECONF_ARGS = --as-needed + DEB_DH_MAKESHLIBS_ARGS_ALL += -V '$(SHARED_PKG) (>= 2.24.0)' DEB_CONFIGURE_EXTRA_FLAGS += --libexecdir=/usr/lib/$(SHARED_PKG)