From 107b884da3fda24932514df0f73c0fc2a479e22a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Sat, 5 Jan 2008 06:20:22 +0000 Subject: [PATCH] * debian/patches/01_kfreebsd.patch, debian/control.in: + Fix FTBFS on GNU/kFreeBSD. Thanks to Petr Salinger for the patch (Closes: #456936). * debian/control.in: + Update Standards-Version to 3.7.3, no additional changes needed. * debian/patches/99_ltmain_as-needed.patch, debian/rules: + Link with --as-needed to remove some unnecessary dependencies. --- debian/changelog | 14 +++++++++++ debian/control | 4 +++- debian/control.in | 4 +++- debian/patches/01_kfreebsd.patch | 16 +++++++++++++ debian/patches/99_ltmain_as-needed.patch | 30 ++++++++++++++++++++++++ debian/rules | 1 + 6 files changed, 67 insertions(+), 2 deletions(-) create mode 100644 debian/patches/01_kfreebsd.patch create mode 100644 debian/patches/99_ltmain_as-needed.patch diff --git a/debian/changelog b/debian/changelog index f39ef153..902a7bba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +libgtop2 (2.20.0-2) unstable; urgency=low + + * debian/patches/01_kfreebsd.patch, + debian/control.in: + + Fix FTBFS on GNU/kFreeBSD. Thanks to Petr Salinger for the patch + (Closes: #456936). + * debian/control.in: + + Update Standards-Version to 3.7.3, no additional changes needed. + * debian/patches/99_ltmain_as-needed.patch, + debian/rules: + + Link with --as-needed to remove some unnecessary dependencies. + + -- Sebastian Dröge Sat, 05 Jan 2008 07:14:55 +0100 + libgtop2 (2.20.0-1) unstable; urgency=low * New upstream release, with some API additions. diff --git a/debian/control b/debian/control index bba32032..bd558f82 100644 --- a/debian/control +++ b/debian/control @@ -13,8 +13,10 @@ Build-Depends: debhelper (>= 5), texinfo, dpkg-dev (>= 1.13.19), libxml-parser-perl, + libgeom-dev [kfreebsd-i386 kfreebsd-amd64], + libdevstat-dev [kfreebsd-i386 kfreebsd-amd64], libkvm-dev [kfreebsd-i386 kfreebsd-amd64] -Standards-Version: 3.7.2 +Standards-Version: 3.7.3 Package: libgtop2-7 Architecture: any diff --git a/debian/control.in b/debian/control.in index 6d2bd480..76051a95 100644 --- a/debian/control.in +++ b/debian/control.in @@ -13,8 +13,10 @@ Build-Depends: debhelper (>= 5), texinfo, dpkg-dev (>= 1.13.19), libxml-parser-perl, + libgeom-dev [kfreebsd-i386 kfreebsd-amd64], + libdevstat-dev [kfreebsd-i386 kfreebsd-amd64], libkvm-dev [kfreebsd-i386 kfreebsd-amd64] -Standards-Version: 3.7.2 +Standards-Version: 3.7.3 Package: libgtop2-7 Architecture: any diff --git a/debian/patches/01_kfreebsd.patch b/debian/patches/01_kfreebsd.patch new file mode 100644 index 00000000..37590cb9 --- /dev/null +++ b/debian/patches/01_kfreebsd.patch @@ -0,0 +1,16 @@ +--- libgtop2-2.20.0.orig/sysdeps/freebsd/open.c ++++ libgtop2-2.20.0/sysdeps/freebsd/open.c +@@ -63,9 +63,11 @@ + server->machine.euid = geteuid (); + server->machine.gid = getgid (); + server->machine.egid = getegid (); +- ++#if defined(__FreeBSD_kernel__) ++ server->os_version_code = __FreeBSD_kernel_version; ++#else + server->os_version_code = __FreeBSD_version; +- ++#endif + /* Setup machine-specific data */ + server->machine.kd = kvm_open (NULL, NULL, NULL, O_RDONLY, "kvm_open"); + diff --git a/debian/patches/99_ltmain_as-needed.patch b/debian/patches/99_ltmain_as-needed.patch new file mode 100644 index 00000000..7a8a274f --- /dev/null +++ b/debian/patches/99_ltmain_as-needed.patch @@ -0,0 +1,30 @@ +--- ltmain.sh.old 2007-10-09 07:38:25.000000000 +0200 ++++ ltmain.sh 2007-10-09 07:39:25.000000000 +0200 +@@ -1794,6 +1794,11 @@ + arg=`$echo "X$arg" | $Xsed -e "s/^ //"` + ;; + ++ -Wl,--as-needed) ++ deplibs="$deplibs $arg" ++ continue ++ ;; ++ + -Wl,*) + args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'` + arg= +@@ -2137,6 +2142,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/rules b/debian/rules index e8460ad7..876b2aaa 100755 --- a/debian/rules +++ b/debian/rules @@ -9,6 +9,7 @@ include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk GNOME_MODULE := libgtop +LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed DEB_DH_MAKESHLIBS_ARGS_ALL += -V 'libgtop2-7 (>= 2.20.0)' ifeq (kfreebsd,$(DEB_HOST_ARCH_OS))