diff options
Diffstat (limited to 'external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk')
| -rw-r--r-- | external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk index 71af2847a5b2..cf0d2eb06cfa 100644 --- a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk +++ b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk @@ -11,27 +11,28 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,mariadb-connector-c)) $(eval $(call gb_UnpackedTarball_set_tarball,mariadb-connector-c,$(MARIADB_CONNECTOR_C_TARBALL))) -$(eval $(call gb_UnpackedTarball_add_file,mariadb-connector-c,include/mysql_version.h,external/mariadb-connector-c/configs/mysql_version.h)) +$(eval $(call gb_UnpackedTarball_add_file,mariadb-connector-c,include/mariadb_version.h,external/mariadb-connector-c/configs/mariadb_version.h)) -ifneq ($(OS),WNT) +ifeq ($(OS),WNT) +$(eval $(call gb_UnpackedTarball_add_file,mariadb-connector-c,include/ma_config.h,external/mariadb-connector-c/configs/wnt_ma_config.h)) +else ifeq ($(OS),MACOSX) -$(eval $(call gb_UnpackedTarball_add_file,mariadb-connector-c,include/my_config.h,external/mariadb-connector-c/configs/mac_my_config.h)) +$(eval $(call gb_UnpackedTarball_add_file,mariadb-connector-c,include/ma_config.h,external/mariadb-connector-c/configs/mac_my_config.h)) else -$(eval $(call gb_UnpackedTarball_add_file,mariadb-connector-c,include/my_config.h,external/mariadb-connector-c/configs/linux_my_config.h)) +$(eval $(call gb_UnpackedTarball_add_file,mariadb-connector-c,include/ma_config.h,external/mariadb-connector-c/configs/linux_my_config.h)) endif endif # $(OS),WNT $(eval $(call gb_UnpackedTarball_set_patchlevel,mariadb-connector-c,1)) -# mariadb-connector-c/mariadb-static-inline.patch upstream at -# <https://mariadb.atlassian.net/browse/CONC-18> "no external definition of -# non-static inline local_thr_alarm in libmariadb/net.c": $(eval $(call gb_UnpackedTarball_add_patches,mariadb-connector-c,\ - external/mariadb-connector-c/mariadb-swap.patch \ - $(if $(filter MSC,$(COM)),external/mariadb-connector-c/mariadb-msvc.patch.1) \ - external/mariadb-connector-c/mariadb-inline.patch.1 \ - external/mariadb-connector-c/mariadb-CONC-104.patch.1 \ external/mariadb-connector-c/clang-cl.patch.0 \ )) +# TODO are any "plugins" needed? +$(eval $(call gb_UnpackedTarball_set_post_action,mariadb-connector-c, \ + < libmariadb/ma_client_plugin.c.in sed -e 's/@EXTERNAL_PLUGINS@//' -e 's/@BUILTIN_PLUGINS@//' > libmariadb/ma_client_plugin.c \ +)) + + # vim: set noet sw=4 ts=4: |