On Thu, 2009-04-02 at 10:46 +0200, Michel Dänzer wrote:
> See #450607... Although I specifically mentioned in
> http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=450607#10 that the
> patch requires re-generating configure, apparently that wasn't done. :(
>
> Note that in the meantime linking libbfd.a also requires -lz. For now
> this may require adding a build-dependency on zlib1g-dev, though
> probably binutils-dev should actually depend on it.
>
> After changing that and running configure, none of the generated
> binaries link dynamically against libbfd for me according to ldd.
> Probably debian/patches/libbfd-gui.patch should just be modified
> accordingly.
Attached debdiff works for me. I'll probably upload to DELAYED unless
somebody spots a problem with it.
Cheers,
Julien
diff -Nru oprofile-0.9.3/debian/changelog oprofile-0.9.3/debian/changelog
--- oprofile-0.9.3/debian/changelog 2008-02-10 20:03:49.000000000 +0100
+++ oprofile-0.9.3/debian/changelog 2009-04-02 10:58:30.000000000 +0200
@@ -1,3 +1,12 @@
+oprofile (0.9.3-2.1) UNRELEASED; urgency=low
+
+ * Non-maintainer upload.
+ * Actually link with the static libbfd. Build-depend on zlib1g-dev because
+ binutils-dev doesn't depend on it, and on automake so we can run
+ autoreconf. Closes: #515908.
+
+ -- Julien Cristau <jcris...@debian.org> Thu, 02 Apr 2009 10:53:06 +0200
+
oprofile (0.9.3-2) unstable; urgency=low
* Closes: bug#415827 -- manpage corrected upstream so that all options are
diff -Nru oprofile-0.9.3/debian/control oprofile-0.9.3/debian/control
--- oprofile-0.9.3/debian/control 2008-02-10 20:03:49.000000000 +0100
+++ oprofile-0.9.3/debian/control 2009-04-02 10:57:52.000000000 +0200
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Al Stone <a...@debian.org>
Standards-Version: 3.7.3
-Build-Depends: debhelper (>> 4.0.0), xsltproc, docbook-xsl, libqt3-mt-dev, libpopt-dev, binutils-dev (>= 2.18~cvs20070812-1), qt3-dev-tools, g++ (>>3.3.1), quilt
+Build-Depends: debhelper (>> 4.0.0), xsltproc, docbook-xsl, libqt3-mt-dev, libpopt-dev, binutils-dev (>= 2.18~cvs20070812-1), zlib1g-dev, qt3-dev-tools, g++ (>>3.3.1), quilt, automake
Package: oprofile
Architecture: i386 ia64 alpha hppa powerpc sparc amd64 arm armel mips
diff -Nru oprofile-0.9.3/debian/patches/libbfd-gui.patch oprofile-0.9.3/debian/patches/libbfd-gui.patch
--- oprofile-0.9.3/debian/patches/libbfd-gui.patch 2008-02-10 20:03:49.000000000 +0100
+++ oprofile-0.9.3/debian/patches/libbfd-gui.patch 2009-04-02 10:52:53.000000000 +0200
@@ -7,7 +7,7 @@
LIBS="$ORIG_SAVE_LIBS"
LIBERTY_LIBS="-liberty $DL_LIB $INTL_LIB"
-BFD_LIBS="-lbfd -liberty $DL_LIB $INTL_LIB"
-+BFD_LIBS="/usr/lib/libbfd.a -liberty $DL_LIB $INTL_LIB"
++BFD_LIBS="/usr/lib/libbfd.a -lz -liberty $DL_LIB $INTL_LIB"
POPT_LIBS="-lpopt"
AC_SUBST(LIBERTY_LIBS)
AC_SUBST(BFD_LIBS)
@@ -20,7 +20,7 @@
AC_CHECK_LIB(dl, dlopen, LIBS="$LIBS -ldl"; DL_LIB="-ldl", DL_LIB="")
AC_CHECK_LIB(intl, main, LIBS="$LIBS -lintl"; INTL_LIB="-lintl", INTL_LIB="")
-AC_CHECK_LIB(bfd, bfd_openr,, AC_MSG_ERROR([bfd library not found]))
-+AC_CHECK_LIB(bfd, bfd_openr, LIBS="$LIBS /usr/lib/libbfd.a", AC_MSG_ERROR([bfd library not found]))
++AC_CHECK_LIB(bfd, bfd_openr, LIBS="$LIBS /usr/lib/libbfd.a -lz", AC_MSG_ERROR([bfd library not found]))
# Determine if bfd_get_synthetic_symtab macro is available
OS="`uname`"
@@ -33,7 +33,7 @@
AC_LANG_PUSH(C)
SAVE_LIBS=$LIBS
-LIBS=" -lbfd -liberty "
-+LIBS=" /usr/lib/libbfd.a -liberty "
++LIBS=" /usr/lib/libbfd.a -lz -liberty "
AC_CHECK_LIB(bfd, bfd_openr_iovec,
[bfd_openr_iovec_exists="yes"],
diff -Nru oprofile-0.9.3/debian/rules oprofile-0.9.3/debian/rules
--- oprofile-0.9.3/debian/rules 2008-02-10 20:03:49.000000000 +0100
+++ oprofile-0.9.3/debian/rules 2009-04-02 10:59:28.000000000 +0200
@@ -35,9 +35,11 @@
fi; \
>$@
-configure: config-stamp patch
+configure: config-stamp patch-stamp
config-stamp:
# cd $(BUILDDIR) && ACLOCAL=aclocal-1.9 AUTOMAKE=automake-1.9 ./autogen.sh
+ >$(BUILDDIR)/NEWS
+ cd $(BUILDDIR) && autoreconf -vfi
cd $(BUILDDIR) && ./configure --host=$(DEB_HOST_GNU_TYPE) --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --with-qt-includes=/usr/include/qt3 --with-kernel-support
touch config-stamp
