25 lines
718 B
Diff
25 lines
718 B
Diff
|
From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
|
||
|
|
Date: Tue, 23 Sep 2014 13:52:37 +0200
|
||
|
|
Subject: [PATCH] remove circular deps on mergedlibs
|
||
|
|
|
||
|
|
- add dbtools to mergedlibs
|
||
|
|
|
||
|
|
---
|
||
|
|
solenv/gbuild/extensions/pre_MergedLibsList.mk | 1 +
|
||
|
|
1 file changed, 1 insertion(+)
|
||
|
|
|
||
|
|
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
|
||
|
|
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
|
||
|
|
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
|
||
|
|
@@ -112,6 +112,7 @@ gb_MERGEDLIBS := \
|
||
|
|
canvastools \
|
||
|
|
configmgr \
|
||
|
|
cppcanvas \
|
||
|
|
+ $(call gb_Helper_optional,DBCONNECTIVITY,dbtools) \
|
||
|
|
deployment \
|
||
|
|
deploymentmisc \
|
||
|
|
$(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \
|
||
|
|
--
|
||
|
|
1.9.1
|
||
|
|
|