Author: xnox Date: 2013-06-07 00:24:29 +0000 (Fri, 07 Jun 2013) New Revision: 13856
Added: trunk/packages/mira/trunk/debian/patches/boost-minimal Removed: trunk/packages/mira/trunk/debian/patches/boost1.53 Modified: trunk/packages/mira/trunk/debian/changelog trunk/packages/mira/trunk/debian/control trunk/packages/mira/trunk/debian/patches/series trunk/packages/mira/trunk/debian/rules Log: * Build depend on libboost-all-dev and libbz2-dev. * Add boost-minimal patch, to add boost-libraries in final linking, fixing FTBFS (Closes: #701322) Modified: trunk/packages/mira/trunk/debian/changelog =================================================================== --- trunk/packages/mira/trunk/debian/changelog 2013-06-06 18:08:34 UTC (rev 13855) +++ trunk/packages/mira/trunk/debian/changelog 2013-06-07 00:24:29 UTC (rev 13856) @@ -12,17 +12,12 @@ * debian/watch: do not look at dev-versions * debian/mira-doc.README.Debian: correct path to documentation * TODO: lintian stuff: manpages - Up to now the new version builds with old gcc and old/new boost. [ Dmitrijs Ledkovs ] - * Use dh-autoreconf - * Build depend on libboost-system-dev. - * Add boost 1.53 patch, link against boost_system, fixing FTBFS (Closes: - #701322) + * Build depend on libboost-all-dev and libbz2-dev. + * Add boost-minimal patch, to add boost-libraries in final linking, + fixing FTBFS (Closes: #701322) * Enable parallel builds, to speed up compilation. - * TODO: - figure out why above doesn't work in sbuild - convert remaining patches to patch Makefile.ams, instead of ins -- Thorsten Alteholz <deb...@alteholz.de> Wed, 05 Jun 2013 18:00:01 +0200 Modified: trunk/packages/mira/trunk/debian/control =================================================================== --- trunk/packages/mira/trunk/debian/control 2013-06-06 18:08:34 UTC (rev 13855) +++ trunk/packages/mira/trunk/debian/control 2013-06-07 00:24:29 UTC (rev 13856) @@ -12,10 +12,8 @@ dh-autoreconf, autoconf-archive, docbook-xsl, - libboost-thread-dev, - libboost-system-dev, - libboost-regex-dev, - libboost-iostreams-dev, + libboost-all-dev, + libbz2-dev, libexpat1-dev, libgoogle-perftools-dev [i386 amd64], perl, Added: trunk/packages/mira/trunk/debian/patches/boost-minimal =================================================================== --- trunk/packages/mira/trunk/debian/patches/boost-minimal (rev 0) +++ trunk/packages/mira/trunk/debian/patches/boost-minimal 2013-06-07 00:24:29 UTC (rev 13856) @@ -0,0 +1,13 @@ +Description: boost minimal + +--- mira-3.9.17.orig/src/progs/Makefile.in ++++ mira-3.9.17/src/progs/Makefile.in +@@ -265,7 +265,7 @@ noinst_HEADERS = quirks.H + # EdIt_abi373 EdIt_alf skimmer + @BUILDMIRASTATIC_TRUE@AM_LDFLAGS = $(BLOODYDARWINSTATLIBDIRHACK) -L../debuggersupport -L../memorc -L../io/ -L../util/ -L../errorhandling/ -L../mira -L../caf $(LINKEDITDIR) $(BOOST_LDFLAGS) -all-static + @BUILDMIRAMEMORC_TRUE@MEMORC = -lmemorc +-MIRALIBS = -lmiradebuggersupport $(MEMORC) -lmira -lmiraestass -lmiracaf -lmirautil -lmiradptools -lmirafio -lmiraerrorhandling -lmiradebuggersupport $(LINKEDITLIB) ++MIRALIBS = -lmiradebuggersupport $(MEMORC) -lmira -lmiraestass -lmiracaf -lmirautil -lmiradptools -lmirafio -lmiraerrorhandling -lmiradebuggersupport -lboost_filesystem -lboost_iostreams -lboost_regex -lboost_thread -lboost_system $(LINKEDITLIB) + sw_SOURCES = sw.C + sw_LDADD = $(MIRALIBS) + mira_SOURCES = mira.C Deleted: trunk/packages/mira/trunk/debian/patches/boost1.53 =================================================================== --- trunk/packages/mira/trunk/debian/patches/boost1.53 2013-06-06 18:08:34 UTC (rev 13855) +++ trunk/packages/mira/trunk/debian/patches/boost1.53 2013-06-07 00:24:29 UTC (rev 13856) @@ -1,72 +0,0 @@ -Description: link against boost_system, fixing FTBFS -Author: Dmitrijs Ledkovs <x...@debian.org> -Bug-Debian: http://bugs.debian.org/701322 - ---- a/configure.in -+++ b/configure.in -@@ -715,16 +715,6 @@ - fi - - --# some of the BOOST checks below break on older systems with newer BOOSTs --# e.g., boost_thread implicitly needs boost_clock and boost_system, --# but the linker on KUbuntu 9.10 somehow does not find them automatically --# Way out: for the boost checks, set the linker rpath to include boost lib path --# (only valid for gcc) --oldCFLAGS=${CFLAGS} --if test x$GCC = xyes; then -- CFLAGS="${CFLAGS} -Wl,-rpath,${ac_boost_lib_path}" --fi -- - echo - echo "+++++++++++++++++++++++++++++++++++++" - echo " BOOST_CPPFLAGS: ${BOOST_CPPFLAGS}" ---- a/src/progs/Makefile.am -+++ b/src/progs/Makefile.am -@@ -46,7 +46,8 @@ - MEMORC= -lmemorc - endif - --MIRALIBS=-lmiradebuggersupport $(MEMORC) -lmira -lmiraestass -lmiracaf -lmirautil -lmiradptools -lmirafio -lmiraerrorhandling -lmiradebuggersupport $(LINKEDITLIB) -+BOOST_LIBS=$(BOOST_FILESYSTEM_LIB) $(BOOST_IOSTREAMS_LIB) $(BOOST_REGEX_LIB) $(BOOST_THREAD_LIB) $(BOOST_SYSTEM_LIB) -+MIRALIBS=-lmiradebuggersupport $(MEMORC) -lmira -lmiraestass -lmiracaf -lmirautil -lmiradptools -lmirafio -lmiraerrorhandling -lmiradebuggersupport $(LINKEDITLIB) $(BOOST_LIBS) - - install-exec-hook: - cd $(DESTDIR)$(bindir) && \ ---- a/config/m4/ax_boost_thread.m4 -+++ b/config/m4/ax_boost_thread.m4 -@@ -60,7 +60,7 @@ - export CPPFLAGS - - LDFLAGS_SAVED="$LDFLAGS" -- LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" -+ LDFLAGS="$LDFLAGS $BOOST_LDFLAGS -lboost_system" - export LDFLAGS - - AC_CACHE_CHECK(whether the Boost::Thread library is available, -@@ -107,14 +107,14 @@ - for libextension in `ls $BOOSTLIBDIR/libboost_thread*.so* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_thread.*\)\.so.*$;\1;'` `ls $BOOSTLIBDIR/libboost_thread*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_thread.*\)\.a*$;\1;'`; do - ax_lib=${libextension} - AC_CHECK_LIB($ax_lib, exit, -- [BOOST_THREAD_LIB="-l$ax_lib"; AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break], -+ [BOOST_THREAD_LIB="-l$ax_lib -lboost_system"; AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break], - [link_thread="no"]) - done - if test "x$link_thread" != "xyes"; then - for libextension in `ls $BOOSTLIBDIR/boost_thread*.dll* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_thread.*\)\.dll.*$;\1;'` `ls $BOOSTLIBDIR/boost_thread*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_thread.*\)\.a*$;\1;'` ; do - ax_lib=${libextension} - AC_CHECK_LIB($ax_lib, exit, -- [BOOST_THREAD_LIB="-l$ax_lib"; AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break], -+ [BOOST_THREAD_LIB="-l$ax_lib -lboost_system"; AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break], - [link_thread="no"]) - done - fi -@@ -122,7 +122,7 @@ - else - for ax_lib in $ax_boost_user_thread_lib boost_thread-$ax_boost_user_thread_lib; do - AC_CHECK_LIB($ax_lib, exit, -- [BOOST_THREAD_LIB="-l$ax_lib"; AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break], -+ [BOOST_THREAD_LIB="-l$ax_lib -lboost_system"; AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break], - [link_thread="no"]) - done - Modified: trunk/packages/mira/trunk/debian/patches/series =================================================================== --- trunk/packages/mira/trunk/debian/patches/series 2013-06-06 18:08:34 UTC (rev 13855) +++ trunk/packages/mira/trunk/debian/patches/series 2013-06-07 00:24:29 UTC (rev 13856) @@ -1,5 +1,5 @@ xsltproc_nonet_for_doc_build add_shebang_lines -boost1.53 spelling.patch +boost-minimal Modified: trunk/packages/mira/trunk/debian/rules =================================================================== --- trunk/packages/mira/trunk/debian/rules 2013-06-06 18:08:34 UTC (rev 13855) +++ trunk/packages/mira/trunk/debian/rules 2013-06-07 00:24:29 UTC (rev 13856) @@ -7,7 +7,7 @@ export DEB_CFLAGS_MAINT_APPEND=-L$(CURDIR)/lib %: - dh $@ --with autoreconf + dh $@ override_dh_auto_install : make install DESTDIR=$(CURDIR)/debian/mira-assembler _______________________________________________ debian-med-commit mailing list debian-med-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit