Bug#531099: lyx: fix boost dependencies

[robertojimen...@terra.es]

Package: lyx

It seems newer boost libraries are only in '-mt' format.

The attached patch makes lyx build again with latest boost libraries in 
unstable.


Ahora también puedes acceder a tu correo Terra desde el móvil.
Infórmate pinchando aquí.

--- lyx/boost/Makefile.in +++ lyx/boost/Makefile.in @@ -335,10 +335,10 @@ @use_included_boost_t...@boost_includes = -I$(top_srcdir)/boost @use_included_boost_fa...@boost_libs = $(BOOST_FILESYSTEM) $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_IOSTREAMS) @use_included_boost_t...@boost_libs = $(top_builddir)/boost/liblyxboost.la -...@use_included_boost_false@BOOST_FILESYSTEM = -lboost_filesystem -...@use_included_boost_false@BOOST_REGEX = -lboost_regex -...@use_included_boost_false@BOOST_SIGNALS = -lboost_signals -...@use_included_boost_false@BOOST_IOSTREAMS = -lboost_iostreams +...@use_included_boost_false@BOOST_FILESYSTEM = -lboost_filesystem-mt +...@use_included_boost_false@BOOST_REGEX = -lboost_regex-mt +...@use_included_boost_false@BOOST_SIGNALS = -lboost_signals-mt +...@use_included_boost_false@BOOST_IOSTREAMS = -lboost_iostreams-mt noinst_LTLIBRARIES = liblyxboost.la # Using precompiled headers makes compilation >10% slower --- lyx/config/common.am +++ lyx/config/common.am @@ -33,10 +33,10 @@ BOOST_LIBS = $(top_builddir)/boost/liblyxboost.la else BOOST_INCLUDES = -BOOST_FILESYSTEM = -lboost_filesystem -BOOST_REGEX = -lboost_regex -BOOST_SIGNALS = -lboost_signals -BOOST_IOSTREAMS = -lboost_iostreams +BOOST_FILESYSTEM = -lboost_filesystem-mt +BOOST_REGEX = -lboost_regex-mt +BOOST_SIGNALS = -lboost_signals-mt +BOOST_IOSTREAMS = -lboost_iostreams-mt BOOST_LIBS = $(BOOST_FILESYSTEM) $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_IOSTREAMS) endif --- lyx/config/Makefile.in +++ lyx/config/Makefile.in @@ -292,10 +292,10 @@ @use_included_boost_t...@boost_includes = -I$(top_srcdir)/boost @use_included_boost_fa...@boost_libs = $(BOOST_FILESYSTEM) $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_IOSTREAMS) @use_included_boost_t...@boost_libs = $(top_builddir)/boost/liblyxboost.la -...@use_included_boost_false@BOOST_FILESYSTEM = -lboost_filesystem -...@use_included_boost_false@BOOST_REGEX = -lboost_regex -...@use_included_boost_false@BOOST_SIGNALS = -lboost_signals -...@use_included_boost_false@BOOST_IOSTREAMS = -lboost_iostreams +...@use_included_boost_false@BOOST_FILESYSTEM = -lboost_filesystem-mt +...@use_included_boost_false@BOOST_REGEX = -lboost_regex-mt +...@use_included_boost_false@BOOST_SIGNALS = -lboost_signals-mt +...@use_included_boost_false@BOOST_IOSTREAMS = -lboost_iostreams-mt EXTRA_DIST = \ common.am \ libtool.m4 \ --- lyx/development/MacOSX/Makefile.in +++ lyx/development/MacOSX/Makefile.in @@ -323,10 +323,10 @@ @use_included_boost_t...@boost_includes = -I$(top_srcdir)/boost @use_included_boost_fa...@boost_libs = $(BOOST_FILESYSTEM) $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_IOSTREAMS) @use_included_boost_t...@boost_libs = $(top_builddir)/boost/liblyxboost.la -...@use_included_boost_false@BOOST_FILESYSTEM = -lboost_filesystem -...@use_included_boost_false@BOOST_REGEX = -lboost_regex -...@use_included_boost_false@BOOST_SIGNALS = -lboost_signals -...@use_included_boost_false@BOOST_IOSTREAMS = -lboost_iostreams +...@use_included_boost_false@BOOST_FILESYSTEM = -lboost_filesystem-mt +...@use_included_boost_false@BOOST_REGEX = -lboost_regex-mt +...@use_included_boost_false@BOOST_SIGNALS = -lboost_signals-mt +...@use_included_boost_false@BOOST_IOSTREAMS = -lboost_iostreams-mt LINGUAS = $(srcdir)/../../po/LINGUAS SUBDIRS = spotlight bundledir = ${prefix}/Contents --- lyx/development/MacOSX/spotlight/Makefile.in +++ lyx/development/MacOSX/spotlight/Makefile.in @@ -308,10 +308,10 @@ @use_included_boost_t...@boost_includes = -I$(top_srcdir)/boost @use_included_boost_fa...@boost_libs = $(BOOST_FILESYSTEM) $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_IOSTREAMS) @use_included_boost_t...@boost_libs = $(top_builddir)/boost/liblyxboost.la -...@use_included_boost_false@BOOST_FILESYSTEM = -lboost_filesystem -...@use_included_boost_false@BOOST_REGEX = -lboost_regex -...@use_included_boost_false@BOOST_SIGNALS = -lboost_signals -...@use_included_boost_false@BOOST_IOSTREAMS = -lboost_iostreams +...@use_included_boost_false@BOOST_FILESYSTEM = -lboost_filesystem-mt +...@use_included_boost_false@BOOST_REGEX = -lboost_regex-mt +...@use_included_boost_false@BOOST_SIGNALS = -lboost_signals-mt +...@use_included_boost_false@BOOST_IOSTREAMS = -lboost_iostreams-mt bundledir = $(prefix)/Contents spotlightdir = $(bundledir)/Library/Spotlight/LyX-Metadata.mdimporter/Contents dist_spotlight_DATA = Info.plist --- lyx/development/Makefile.in +++ lyx/development/Makefile.in @@ -302,10 +302,10 @@ @use_included_boost_t...@boost_includes = -I$(top_srcdir)/boost @use_included_boost_fa...@boost_libs = $(BOOST_FILESYSTEM) $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_IOSTREAMS) @use_included_boost_t...@boost_libs = $(top_builddir)/boost/liblyxboost.la -...@use_included_boost_false@BOOST_FILESYSTEM = -lboost_filesystem -...@use_included_boost_false@BOOST_REGEX = -lboost_regex -...@use_included_boost_false@BOOST_SIGNALS = -lboost_signals -...@use_included_boost_false@BOOST_IOSTREAMS = -lboost_iostreams +...@use_included_boost_false@BOOST_FILESYSTEM = -lboost_filesystem-mt +...@use_included_boost_false@BOOST_REGEX = -lboost_regex-mt +...@use_included_boost_false@BOOST_SIGNALS = -lboost_signals-mt +...@use_included_boost_false@BOOST_IOSTREAMS = -lboost_iostreams-mt @install_macosx_t...@subdirs = MacOSX EXTRA_DIST = boostworkaround.txt coding/Rules coding/Recommendations \ FORMAT lyx.rpm.README \ --- lyx/lib/doc/Makefile.in +++ lyx/lib/doc/Makefile.in @@ -369,10 +369,10 @@ @use_included_boost_t...@boost_includes = -I$(top_srcdir)/boost @use_included_boost_fa...@boost_libs = $(BOOST_FILESYSTEM) $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_IOSTREAMS) @use_included_boost_t...@boost_libs = $(top_builddir)/boost/liblyxboost.la -...@use_included_boost_false@BOOST_FILESYSTEM = -lboost_filesystem -...@use_included_boost_false@BOOST_REGEX = -lboost_regex -...@use_included_boost_false@BOOST_SIGNALS = -lboost_signals -...@use_included_boost_false@BOOST_IOSTREAMS = -lboost_iostreams +...@use_included_boost_false@BOOST_FILESYSTEM = -lboost_filesystem-mt +...@use_included_boost_false@BOOST_REGEX = -lboost_regex-mt +...@use_included_boost_false@BOOST_SIGNALS = -lboost_signals-mt +...@use_included_boost_false@BOOST_IOSTREAMS = -lboost_iostreams-mt EXTRA_DIST = README.Documentation dist_doc_DATA = \ Customization.lyx \ --- lyx/lib/lyx2lyx/Makefile.in +++ lyx/lib/lyx2lyx/Makefile.in @@ -300,10 +300,10 @@ @use_included_boost_t...@boost_includes = -I$(top_srcdir)/boost @use_included_boost_fa...@boost_libs = $(BOOST_FILESYSTEM) $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_IOSTREAMS) @use_included_boost_t...@boost_libs = $(top_builddir)/boost/liblyxboost.la -...@use_included_boost_false@BOOST_FILESYSTEM = -lboost_filesystem -...@use_included_boost_false@BOOST_REGEX = -lboost_regex -...@use_included_boost_false@BOOST_SIGNALS = -lboost_signals -...@use_included_boost_false@BOOST_IOSTREAMS = -lboost_iostreams +...@use_included_boost_false@BOOST_FILESYSTEM = -lboost_filesystem-mt +...@use_included_boost_false@BOOST_REGEX = -lboost_regex-mt +...@use_included_boost_false@BOOST_SIGNALS = -lboost_signals-mt +...@use_included_boost_false@BOOST_IOSTREAMS = -lboost_iostreams-mt EXTRA_DIST = lyx2lyx_version.py.in CHMOD = chmod lyx2lyxdir = $(pkgdatadir)/lyx2lyx --- lyx/lib/Makefile.in +++ lyx/lib/Makefile.in @@ -406,10 +406,10 @@ @use_included_boost_t...@boost_includes = -I$(top_srcdir)/boost @use_included_boost_fa...@boost_libs = $(BOOST_FILESYSTEM) $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_IOSTREAMS) @use_included_boost_t...@boost_libs = $(top_builddir)/boost/liblyxboost.la -...@use_included_boost_false@BOOST_FILESYSTEM = -lboost_filesystem -...@use_included_boost_false@BOOST_REGEX = -lboost_regex -...@use_included_boost_false@BOOST_SIGNALS = -lboost_signals -...@use_included_boost_false@BOOST_IOSTREAMS = -lboost_iostreams +...@use_included_boost_false@BOOST_FILESYSTEM = -lboost_filesystem-mt +...@use_included_boost_false@BOOST_REGEX = -lboost_regex-mt +...@use_included_boost_false@BOOST_SIGNALS = -lboost_signals-mt +...@use_included_boost_false@BOOST_IOSTREAMS = -lboost_iostreams-mt SUBDIRS = doc lyx2lyx CHMOD = chmod dist_pkgdata_DATA = CREDITS chkconfig.ltx external_templates encodings \ --- lyx/Makefile.in +++ lyx/Makefile.in @@ -320,10 +320,10 @@ @use_included_boost_t...@boost_includes = -I$(top_srcdir)/boost @use_included_boost_fa...@boost_libs = $(BOOST_FILESYSTEM) $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_IOSTREAMS) @use_included_boost_t...@boost_libs = $(top_builddir)/boost/liblyxboost.la -...@use_included_boost_false@BOOST_FILESYSTEM = -lboost_filesystem -...@use_included_boost_false@BOOST_REGEX = -lboost_regex -...@use_included_boost_false@BOOST_SIGNALS = -lboost_signals -...@use_included_boost_false@BOOST_IOSTREAMS = -lboost_iostreams +...@use_included_boost_false@BOOST_FILESYSTEM = -lboost_filesystem-mt +...@use_included_boost_false@BOOST_REGEX = -lboost_regex-mt +...@use_included_boost_false@BOOST_SIGNALS = -lboost_signals-mt +...@use_included_boost_false@BOOST_IOSTREAMS = -lboost_iostreams-mt ACLOCAL_AMFLAGS = -I m4 -I config DIST_SUBDIRS = m4 config development intl po boost src sourcedoc lib @build_client_subdir_t...@client = src/client --- lyx/sourcedoc/Makefile.in +++ lyx/sourcedoc/Makefile.in @@ -290,10 +290,10 @@ @use_included_boost_t...@boost_includes = -I$(top_srcdir)/boost @use_included_boost_fa...@boost_libs = $(BOOST_FILESYSTEM) $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_IOSTREAMS) @use_included_boost_t...@boost_libs = $(top_builddir)/boost/liblyxboost.la -...@use_included_boost_false@BOOST_FILESYSTEM = -lboost_filesystem -...@use_included_boost_false@BOOST_REGEX = -lboost_regex -...@use_included_boost_false@BOOST_SIGNALS = -lboost_signals -...@use_included_boost_false@BOOST_IOSTREAMS = -lboost_iostreams +...@use_included_boost_false@BOOST_FILESYSTEM = -lboost_filesystem-mt +...@use_included_boost_false@BOOST_REGEX = -lboost_regex-mt +...@use_included_boost_false@BOOST_SIGNALS = -lboost_signals-mt +...@use_included_boost_false@BOOST_IOSTREAMS = -lboost_iostreams-mt EXTRA_DIST = Doxyfile.in all: all-am --- lyx/src/client/Makefile.in +++ lyx/src/client/Makefile.in @@ -345,10 +345,10 @@ @use_included_boost_t...@boost_includes = -I$(top_srcdir)/boost @use_included_boost_fa...@boost_libs = $(BOOST_FILESYSTEM) $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_IOSTREAMS) @use_included_boost_t...@boost_libs = $(top_builddir)/boost/liblyxboost.la -...@use_included_boost_false@BOOST_FILESYSTEM = -lboost_filesystem -...@use_included_boost_false@BOOST_REGEX = -lboost_regex -...@use_included_boost_false@BOOST_SIGNALS = -lboost_signals -...@use_included_boost_false@BOOST_IOSTREAMS = -lboost_iostreams +...@use_included_boost_false@BOOST_FILESYSTEM = -lboost_filesystem-mt +...@use_included_boost_false@BOOST_REGEX = -lboost_regex-mt +...@use_included_boost_false@BOOST_SIGNALS = -lboost_signals-mt +...@use_included_boost_false@BOOST_IOSTREAMS = -lboost_iostreams-mt man_MANS = lyxclient.1 EXTRA_DIST = lyxclient.man $(am__append_2) lyxclient_LDADD = \ --- lyx/src/frontends/Makefile.in +++ lyx/src/frontends/Makefile.in @@ -338,10 +338,10 @@ @use_included_boost_t...@boost_includes = -I$(top_srcdir)/boost @use_included_boost_fa...@boost_libs = $(BOOST_FILESYSTEM) $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_IOSTREAMS) @use_included_boost_t...@boost_libs = $(top_builddir)/boost/liblyxboost.la -...@use_included_boost_false@BOOST_FILESYSTEM = -lboost_filesystem -...@use_included_boost_false@BOOST_REGEX = -lboost_regex -...@use_included_boost_false@BOOST_SIGNALS = -lboost_signals -...@use_included_boost_false@BOOST_IOSTREAMS = -lboost_iostreams +...@use_included_boost_false@BOOST_FILESYSTEM = -lboost_filesystem-mt +...@use_included_boost_false@BOOST_REGEX = -lboost_regex-mt +...@use_included_boost_false@BOOST_SIGNALS = -lboost_signals-mt +...@use_included_boost_false@BOOST_IOSTREAMS = -lboost_iostreams-mt SUBDIRS = $(FRONTENDS_SUBDIRS) . DIST_SUBDIRS = qt4 . noinst_LTLIBRARIES = liblyxfrontends.la --- lyx/src/frontends/qt4/Makefile.in +++ lyx/src/frontends/qt4/Makefile.in @@ -404,10 +404,10 @@ @use_included_boost_t...@boost_includes = -I$(top_srcdir)/boost @use_included_boost_fa...@boost_libs = $(BOOST_FILESYSTEM) $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_IOSTREAMS) @use_included_boost_t...@boost_libs = $(top_builddir)/boost/liblyxboost.la -...@use_included_boost_false@BOOST_FILESYSTEM = -lboost_filesystem -...@use_included_boost_false@BOOST_REGEX = -lboost_regex -...@use_included_boost_false@BOOST_SIGNALS = -lboost_signals -...@use_included_boost_false@BOOST_IOSTREAMS = -lboost_iostreams +...@use_included_boost_false@BOOST_FILESYSTEM = -lboost_filesystem-mt +...@use_included_boost_false@BOOST_REGEX = -lboost_regex-mt +...@use_included_boost_false@BOOST_SIGNALS = -lboost_signals-mt +...@use_included_boost_false@BOOST_IOSTREAMS = -lboost_iostreams-mt BUILT_SOURCES = $(UIFILES:%.ui=ui_%.h) $(MOCEDFILES) Resources.cpp \ Resources.qrc $(am__append_1) $(am__append_3) --- lyx/src/Makefile.in +++ lyx/src/Makefile.in @@ -610,10 +610,10 @@ @use_included_boost_t...@boost_includes = -I$(top_srcdir)/boost @use_included_boost_fa...@boost_libs = $(BOOST_FILESYSTEM) $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_IOSTREAMS) @use_included_boost_t...@boost_libs = $(top_builddir)/boost/liblyxboost.la -...@use_included_boost_false@BOOST_FILESYSTEM = -lboost_filesystem -...@use_included_boost_false@BOOST_REGEX = -lboost_regex -...@use_included_boost_false@BOOST_SIGNALS = -lboost_signals -...@use_included_boost_false@BOOST_IOSTREAMS = -lboost_iostreams +...@use_included_boost_false@BOOST_FILESYSTEM = -lboost_filesystem-mt +...@use_included_boost_false@BOOST_REGEX = -lboost_regex-mt +...@use_included_boost_false@BOOST_SIGNALS = -lboost_signals-mt +...@use_included_boost_false@BOOST_IOSTREAMS = -lboost_iostreams-mt @build_client_subdir_t...@client = client SUBDIRS = support frontends . $(CLIENT) tex2lyx --- lyx/src/support/Makefile.in +++ lyx/src/support/Makefile.in @@ -397,10 +397,10 @@ @use_included_boost_t...@boost_includes = -I$(top_srcdir)/boost @use_included_boost_fa...@boost_libs = $(BOOST_FILESYSTEM) $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_IOSTREAMS) @use_included_boost_t...@boost_libs = $(top_builddir)/boost/liblyxboost.la -...@use_included_boost_false@BOOST_FILESYSTEM = -lboost_filesystem -...@use_included_boost_false@BOOST_REGEX = -lboost_regex -...@use_included_boost_false@BOOST_SIGNALS = -lboost_signals -...@use_included_boost_false@BOOST_IOSTREAMS = -lboost_iostreams +...@use_included_boost_false@BOOST_FILESYSTEM = -lboost_filesystem-mt +...@use_included_boost_false@BOOST_REGEX = -lboost_regex-mt +...@use_included_boost_false@BOOST_SIGNALS = -lboost_signals-mt +...@use_included_boost_false@BOOST_IOSTREAMS = -lboost_iostreams-mt ############################## Tests ################################## EXTRA_DIST = pch.h os_cygwin.cpp os_unix.cpp os_win32.cpp os_win32.h \ --- lyx/src/tex2lyx/Makefile.in +++ lyx/src/tex2lyx/Makefile.in @@ -340,10 +340,10 @@ @use_included_boost_t...@boost_includes = -I$(top_srcdir)/boost @use_included_boost_fa...@boost_libs = $(BOOST_FILESYSTEM) $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_IOSTREAMS) @use_included_boost_t...@boost_libs = $(top_builddir)/boost/liblyxboost.la -...@use_included_boost_false@BOOST_FILESYSTEM = -lboost_filesystem -...@use_included_boost_false@BOOST_REGEX = -lboost_regex -...@use_included_boost_false@BOOST_SIGNALS = -lboost_signals -...@use_included_boost_false@BOOST_IOSTREAMS = -lboost_iostreams +...@use_included_boost_false@BOOST_FILESYSTEM = -lboost_filesystem-mt +...@use_included_boost_false@BOOST_REGEX = -lboost_regex-mt +...@use_included_boost_false@BOOST_SIGNALS = -lboost_signals-mt +...@use_included_boost_false@BOOST_IOSTREAMS = -lboost_iostreams-mt EXTRA_DIST = tex2lyx.1 $(TEST_FILES) pch.h #noinst_LTLIBRARIES = libtexparser.la