[Libreoffice-commits] core.git: connectivity/Library_kab1.mk connectivity/Library_kabdrv1.mk

Stephan Bergmann sbergman at redhat.com
Sun Feb 17 02:47:58 PST 2013


 connectivity/Library_kab1.mk    |    5 ++++-
 connectivity/Library_kabdrv1.mk |    1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 4d33da4065bb7620d78f10d04b840f2dd77c6e6e
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sun Feb 17 11:44:07 2013 +0100

    connectivity/kab (indirectly) depends on boost_header
    
    ...at least via KDriver.cxx -> tools/diagnose_ex.h -> boost/noncopyable.hpp
    (kab1) and KStatement.cxx -> KStatement.hxx -> connectivity/sqliterator.hxx ->
    boost/shared_ptr.hpp (kabdrv1).  Becomes evident when building
    --with-system-boost --with-boost=... on a machine with no system-wide Boost
    installation.  Not sure solving those problems this way is the best approach,
    though.
    
    Change-Id: Ida72362596aaac076efc4e1faab41fa47013975f

diff --git a/connectivity/Library_kab1.mk b/connectivity/Library_kab1.mk
index 7fd80cb..e51ab45 100644
--- a/connectivity/Library_kab1.mk
+++ b/connectivity/Library_kab1.mk
@@ -27,7 +27,10 @@
 
 $(eval $(call gb_Library_Library,kab1))
 
-$(eval $(call gb_Library_use_externals,kab1,kde))
+$(eval $(call gb_Library_use_externals,kab1, \
+    boost_headers \
+    kde \
+))
 
 $(eval $(call gb_Library_set_componentfile,kab1,connectivity/source/drivers/kab/kab1))
 
diff --git a/connectivity/Library_kabdrv1.mk b/connectivity/Library_kabdrv1.mk
index ecdd905..9050c71 100644
--- a/connectivity/Library_kabdrv1.mk
+++ b/connectivity/Library_kabdrv1.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Library_use_packages,kabdrv1,\
 $(eval $(call gb_Library_use_sdk_api,kabdrv1))
 
 $(eval $(call gb_Library_use_externals,kabdrv1,\
+	boost_headers \
 	kde \
 ))
 


More information about the Libreoffice-commits mailing list