diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-01-28 23:53:30 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-01-28 23:57:28 +0100 |
| commit | 5f356bd99726818dc44b316be3327dad057f7cbe (patch) | |
| tree | 1f94463781231d12a0d41e5d5981e32cd0084d87 /RepositoryExternal.mk | |
| parent | b02d799732594eee67cab0f86dc3b09182f628a5 (diff) | |
mysqlc: tweak gbuild conversion:
- the mysqlc library did link against the mysqlcppconn only when a
SYSTEM_MYSQL_CPPCONN is used
- mysqlc is an EXTENSIONLIB, mysqlcppconn is PLAINLIBS_NONE
- one N was missing in Extension makefile, and use
gb_Extension_add_library to put in mysqlcppconn
- manifest.xml, description.xml: update PLACEHOLDERS
Change-Id: If45714f81056a6c1a4cb3380b50cc3dcc0443bb8
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 404732e42f2e..79039d6ef447 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -228,15 +228,15 @@ endef else -$(eval $(call gb_Helper_register_libraries,OOOLIBS,\ +$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE,\ mysqlcppconn \ )) +# note: this does not link mysqlcppconn, it is loaded via osl_loadModuleRelative define gb_LinkTarget__use_mysqlcppconn -$(call gb_LinkTarget_use_libraries,$(1),\ - mysqlcppconn \ -) +$(call gb_LinkTarget_use_unpacked,$(1),mysqlcppconn) + $(call gb_LinkTarget_add_defs,$(1),\ -DCPPCONN_LIB_BUILD \ ) |