diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-09-14 13:30:05 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-09-15 10:59:56 +0200 |
| commit | 871d75e9c2c82d4b3ffbbff80f1dfa7a823e4f3d (patch) | |
| tree | ba997ca727e6eccaea4b1877f2b4b1f682facaba /RepositoryExternal.mk | |
| parent | 0bb764854361249c60ea31c5366a91dcd938c747 (diff) | |
consistent naming of externals: libmariadb -> mariadb-connector-c
The used version is actually named mariadb_client but since 2.1.0
upstream calls it MariaDB Connector/C.
Change-Id: I51b12a9be55151919585dec91a5fc802ff4fc86b
Reviewed-on: https://gerrit.libreoffice.org/42295
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index fa8e6845e1ef..4794fce5541e 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -226,9 +226,9 @@ $(call gb_LinkTarget_add_libs,$(1),-liconv) endef -ifneq ($(SYSTEM_MARIADB),) +ifneq ($(SYSTEM_MARIADB_CONNECTOR_C),) -define gb_LinkTarget__use_mariadb +define gb_LinkTarget__use_mariadb-connector-c $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ $(MARIADB_CFLAGS) \ @@ -236,29 +236,29 @@ $(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_add_libs,$(1),$(MARIADB_LIBS)) endef -gb_ExternalProject__use_mariadb := +gb_ExternalProject__use_mariadb-connector-c := -else # !SYSTEM_MARIADB +else # !SYSTEM_MARIADB_CONNECTOR_C -define gb_LinkTarget__use_mariadb +define gb_LinkTarget__use_mariadb-connector-c $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ $(MARIADB_CFLAGS) \ ) $(call gb_LinkTarget_use_static_libraries,$(1),\ - mariadblib \ + mariadb-connector-c \ ) endef -define gb_ExternalProject__use_mariadb -$(call gb_ExternalProject_use_static_libraries,$(1),mariadblib) +define gb_ExternalProject__use_mariadb-connector-c +$(call gb_ExternalProject_use_static_libraries,$(1),mariadb-connector-c) endef -endif # SYSTEM_MARIADB +endif # SYSTEM_MARIADB_CONNECTOR_C -ifneq ($(SYSTEM_MARIADB),) +ifneq ($(SYSTEM_MARIADB_CONNECTOR_C),) define gb_LinkTarget__use_mysql |