You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

29 lines
1008 B

  1. From 04a7d98cb91139d79dd14cbdb0522d3d5898dd12 Mon Sep 17 00:00:00 2001
  2. From: Rosen Penev <rosenp@gmail.com>
  3. Date: Fri, 10 Jul 2020 20:40:07 -0700
  4. Subject: [PATCH] [meson] fix libmariadb dependency
  5. libmariadb is what should be used as only the library portion is used.
  6. Fixes compilation under OpenWrt.
  7. Note that mariadb.pc is a superset that links to libmariadb.
  8. Signed-off-by: Rosen Penev <rosenp@gmail.com>
  9. ---
  10. src/meson.build | 2 +-
  11. 1 file changed, 1 insertion(+), 1 deletion(-)
  12. diff --git a/src/meson.build b/src/meson.build
  13. index 43ef9540..d39cf1c0 100644
  14. --- a/src/meson.build
  15. +++ b/src/meson.build
  16. @@ -387,7 +387,7 @@ if get_option('with_mysql')
  17. # manual search: extend include path with 'mysql/'
  18. # header: mysql.h
  19. # function: mysql_real_connect (-lmariadb)
  20. - libmysqlclient = [ dependency('mariadb') ]
  21. + libmysqlclient = [ dependency('libmariadb') ]
  22. #-# function: mysql_real_connect (-lmysqlclient)
  23. #-libmysqlclient = [ dependency('mysqlclient') ]
  24. conf_data.set('HAVE_MYSQL', true)