Drop 99_ltmain_as-needed.patch and use dh_autoreconf --as-needed instead.
This commit is contained in:
1
debian/changelog
vendored
1
debian/changelog
vendored
@@ -2,6 +2,7 @@ libgtop2 (2.28.5-1) UNRELEASED; urgency=low
|
|||||||
|
|
||||||
* New upstream release.
|
* New upstream release.
|
||||||
* Remove those kfreebsd patches which have been merged upstream.
|
* Remove those kfreebsd patches which have been merged upstream.
|
||||||
|
* Drop 99_ltmain_as-needed.patch and use dh_autoreconf --as-needed instead.
|
||||||
|
|
||||||
-- Michael Biebl <biebl@debian.org> Thu, 05 Sep 2013 02:37:50 +0200
|
-- Michael Biebl <biebl@debian.org> Thu, 05 Sep 2013 02:37:50 +0200
|
||||||
|
|
||||||
|
|||||||
32
debian/patches/99_ltmain_as-needed.patch
vendored
32
debian/patches/99_ltmain_as-needed.patch
vendored
@@ -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"
|
|
||||||
1
debian/patches/series
vendored
1
debian/patches/series
vendored
@@ -1,4 +1,3 @@
|
|||||||
02_hurd_stub_backend.patch
|
02_hurd_stub_backend.patch
|
||||||
03_kfreebsd_installdirs.patch
|
03_kfreebsd_installdirs.patch
|
||||||
06_kfreebsd_sys_pipe.patch
|
06_kfreebsd_sys_pipe.patch
|
||||||
99_ltmain_as-needed.patch
|
|
||||||
|
|||||||
3
debian/rules
vendored
3
debian/rules
vendored
@@ -12,6 +12,9 @@ GNOME_MODULE := libgtop
|
|||||||
SHARED_PKG := libgtop2-7
|
SHARED_PKG := libgtop2-7
|
||||||
|
|
||||||
LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
|
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_DH_MAKESHLIBS_ARGS_ALL += -V '$(SHARED_PKG) (>= 2.24.0)'
|
||||||
|
|
||||||
DEB_CONFIGURE_EXTRA_FLAGS += --libexecdir=/usr/lib/$(SHARED_PKG)
|
DEB_CONFIGURE_EXTRA_FLAGS += --libexecdir=/usr/lib/$(SHARED_PKG)
|
||||||
|
|||||||
Reference in New Issue
Block a user