diff options
| author | Slávek Banko <[email protected]> | 2018-07-26 18:12:33 +0200 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2018-07-26 18:12:54 +0200 |
| commit | 13b67c9bf79a68cd654e94ff24a0b9274681ace6 (patch) | |
| tree | 48efc8a447491f2eaf9ccac7b306bc0ef224bdc2 /lib/kross | |
| parent | ad5d5e83d748c73885eb9016137b2a13f1ec2a36 (diff) | |
| download | koffice-13b67c9bf79a68cd654e94ff24a0b9274681ace6.tar.gz koffice-13b67c9bf79a68cd654e94ff24a0b9274681ace6.zip | |
Fix FTBFS with libpqxx >= 6.x
Signed-off-by: Slávek Banko <[email protected]>
(cherry picked from commit c17464869b6c5f7fbbf5a072ea470fbfff2ae26b)
Diffstat (limited to 'lib/kross')
| -rw-r--r-- | lib/kross/api/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/kross/main/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/kross/python/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/kross/python/cxx/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/kross/ruby/Makefile.am | 2 |
5 files changed, 10 insertions, 0 deletions
diff --git a/lib/kross/api/Makefile.am b/lib/kross/api/Makefile.am index 7cc93ba8..7f131342 100644 --- a/lib/kross/api/Makefile.am +++ b/lib/kross/api/Makefile.am @@ -1,6 +1,8 @@ include $(top_srcdir)/lib/kross/Makefile.global apiincludedir=$(includedir)/kross/api +CXXFLAGS += $(USE_EXCEPTIONS) + apiinclude_HEADERS = \ callable.h \ class.h \ diff --git a/lib/kross/main/Makefile.am b/lib/kross/main/Makefile.am index 2acab100..7d779b82 100644 --- a/lib/kross/main/Makefile.am +++ b/lib/kross/main/Makefile.am @@ -1,5 +1,7 @@ include $(top_srcdir)/lib/kross/Makefile.global +CXXFLAGS += $(USE_EXCEPTIONS) + lib_LTLIBRARIES = libkrossmain.la libkrossmain_la_SOURCES = krossconfig.cpp mainmodule.cpp scriptcontainer.cpp manager.cpp \ diff --git a/lib/kross/python/Makefile.am b/lib/kross/python/Makefile.am index 743b3e0c..0fc93556 100644 --- a/lib/kross/python/Makefile.am +++ b/lib/kross/python/Makefile.am @@ -1,5 +1,7 @@ include $(top_srcdir)/lib/kross/Makefile.global +CXXFLAGS += $(USE_EXCEPTIONS) + kde_module_LTLIBRARIES = krosspython.la krosspython_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(LIBPYTHON) $(PYTHONLIB) -module $(VER_INFO) diff --git a/lib/kross/python/cxx/Makefile.am b/lib/kross/python/cxx/Makefile.am index d1c72c87..4e1377c0 100644 --- a/lib/kross/python/cxx/Makefile.am +++ b/lib/kross/python/cxx/Makefile.am @@ -1,5 +1,7 @@ include $(top_srcdir)/lib/kross/Makefile.global +CXXFLAGS += $(USE_EXCEPTIONS) + noinst_LTLIBRARIES = libkrosspythoncxx.la libkrosspythoncxx_la_SOURCES = \ diff --git a/lib/kross/ruby/Makefile.am b/lib/kross/ruby/Makefile.am index 256c662b..fadee61e 100644 --- a/lib/kross/ruby/Makefile.am +++ b/lib/kross/ruby/Makefile.am @@ -1,5 +1,7 @@ include $(top_srcdir)/lib/kross/Makefile.global +CXXFLAGS += $(USE_EXCEPTIONS) + INCLUDES = -I$(top_srcdir)/lib/kross -I$(RUBY_INCLUDEDIR) $(RUBY_CFLAGS) $(all_includes) METASOURCES = AUTO kde_module_LTLIBRARIES = krossruby.la |