Author: xnox Date: 2013-06-06 09:43:45 +0000 (Thu, 06 Jun 2013) New Revision: 13851
Added: 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: * TODO: lintian stuff: manpages * Use dh-autoreconf * Build depend on libboost-system-dev. * Add boost 1.53 patch, link against boost_system, 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 Modified: trunk/packages/mira/trunk/debian/changelog =================================================================== --- trunk/packages/mira/trunk/debian/changelog 2013-06-05 21:05:26 UTC (rev 13850) +++ trunk/packages/mira/trunk/debian/changelog 2013-06-06 09:43:45 UTC (rev 13851) @@ -1,5 +1,6 @@ mira (3.9.17-1) UNRELEASED; urgency=low + [ Thorsten Alteholz ] * new upstream version * debian/control: Standards-Version set to 3.9.4 (no changes) * debian/control: DM-Upload-Allowed: removed @@ -7,15 +8,23 @@ * debian/control: add dependency to libboost-iostreams-dev * debian/rules: get-orig-source added * debian/watch: do not look at dev-versions - * TODO: RC bug (gcc4.8) - boost 1.53 - lintian stuff: manpages + * TODO: lintian stuff: manpages spelling errors hardening flags for fastatool extended description docbase Up to now the new version builds with old gcc and old 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) + * 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 mira (3.4.0.1-3) unstable; urgency=low Modified: trunk/packages/mira/trunk/debian/control =================================================================== --- trunk/packages/mira/trunk/debian/control 2013-06-05 21:05:26 UTC (rev 13850) +++ trunk/packages/mira/trunk/debian/control 2013-06-06 09:43:45 UTC (rev 13851) @@ -8,10 +8,12 @@ Andreas Tille <ti...@debian.org>, Thorsten Alteholz <deb...@alteholz.de> Build-Depends: debhelper (>= 9), - autotools-dev, - dblatex, + dblatex, + dh-autoreconf, + autoconf-archive, docbook-xsl, - libboost-thread-dev, + libboost-thread-dev, + libboost-system-dev, libboost-regex-dev, libboost-iostreams-dev, libexpat1-dev, Added: trunk/packages/mira/trunk/debian/patches/boost1.53 =================================================================== --- trunk/packages/mira/trunk/debian/patches/boost1.53 (rev 0) +++ trunk/packages/mira/trunk/debian/patches/boost1.53 2013-06-06 09:43:45 UTC (rev 13851) @@ -0,0 +1,72 @@ +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-05 21:05:26 UTC (rev 13850) +++ trunk/packages/mira/trunk/debian/patches/series 2013-06-06 09:43:45 UTC (rev 13851) @@ -1,3 +1,4 @@ xsltproc_nonet_for_doc_build hardening-flags.patch add_shebang_lines +boost1.53 Modified: trunk/packages/mira/trunk/debian/rules =================================================================== --- trunk/packages/mira/trunk/debian/rules 2013-06-05 21:05:26 UTC (rev 13850) +++ trunk/packages/mira/trunk/debian/rules 2013-06-06 09:43:45 UTC (rev 13851) @@ -7,7 +7,7 @@ export DEB_CFLAGS_MAINT_APPEND=-L$(CURDIR)/lib %: - dh $@ + dh $@ --with autoreconf override_dh_auto_install : make install DESTDIR=$(CURDIR)/debian/mira-assembler @@ -21,9 +21,9 @@ #Make the docs override_dh_auto_build: - dh_auto_build + dh_auto_build --parallel ifneq (,$(findstring mira-doc, $(shell dh_listpackages))) - dh_auto_build --sourcedir=doc + dh_auto_build --sourcedir=doc --parallel endif #Remove unneeded .tcl extensions from scripts _______________________________________________ debian-med-commit mailing list debian-med-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit