Sat May 8 15:51:28 2021 UTC ()
merge the version check for Darwin and !Darwin

mariadb55-client is now detected and used if available on macOS


(jdolecek)
diff -r1.28 -r1.29 pkgsrc/mk/mysql.buildlink3.mk
cvs diff -r1.28 -r1.29 pkgsrc/mk/mysql.buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/mk/mysql.buildlink3.mk 2020/10/20 21:53:31 1.28
+++ pkgsrc/mk/mysql.buildlink3.mk 2021/05/08 15:51:28 1.29
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mysql.buildlink3.mk,v 1.28 2020/10/20 21:53:31 otis Exp $ 1# $NetBSD: mysql.buildlink3.mk,v 1.29 2021/05/08 15:51:28 jdolecek Exp $
2# 2#
3# This file is included by packages that require some version of the 3# This file is included by packages that require some version of the
4# MySQL database client. 4# MySQL database client.
5# 5#
6# User-settable variables: 6# User-settable variables:
7# 7#
8# MYSQL_VERSION_DEFAULT 8# MYSQL_VERSION_DEFAULT
9# The preferred MySQL version. 9# The preferred MySQL version.
10# 10#
11# Possible: 57 56 MARIADB55 11# Possible: 57 56 MARIADB55
12# Default: 57 12# Default: 57
13# 13#
14# Package-settable variables: 14# Package-settable variables:
@@ -36,49 +36,44 @@ _SYS_VARS.mysql= MYSQL_PKGSRCDIR @@ -36,49 +36,44 @@ _SYS_VARS.mysql= MYSQL_PKGSRCDIR
36 36
37.include "../../mk/bsd.prefs.mk" 37.include "../../mk/bsd.prefs.mk"
38 38
39MYSQL_VERSION_DEFAULT?= 57 39MYSQL_VERSION_DEFAULT?= 57
40MYSQL_VERSIONS_ACCEPTED?= 57 56 MARIADB55 40MYSQL_VERSIONS_ACCEPTED?= 57 56 MARIADB55
41 41
42# transform the list into individual variables 42# transform the list into individual variables
43.for mv in ${MYSQL_VERSIONS_ACCEPTED} 43.for mv in ${MYSQL_VERSIONS_ACCEPTED}
44_MYSQL_VERSION_${mv}_OK= yes 44_MYSQL_VERSION_${mv}_OK= yes
45.endfor 45.endfor
46 46
47# check what is installed 47# check what is installed
48.if ${OPSYS} == "Darwin" 48.if ${OPSYS} == "Darwin"
49. if exists(${LOCALBASE}/lib/libmysqlclient.20.dylib) 49_MYSQL_SO_57= 20.dylib
50_MYSQL_VERSION_57_INSTALLED= yes 50_MYSQL_SO_56= 18.dylib
51_MYSQL_VERSION_INSTALLED= 57 
52. endif 
53. if exists(${LOCALBASE}/lib/libmysqlclient.18.dylib) 
54. if exists(${LOCALBASE}/include/mysql/mysql/client_authentication.h) 
55_MYSQL_VERSION_56_INSTALLED= yes 
56_MYSQL_VERSION_INSTALLED= 56 
57. endif 
58. endif 
59.else 51.else
60. if exists(${LOCALBASE}/lib/libmysqlclient.so.20) 52_MYSQL_SO_57= so.20
 53_MYSQL_SO_56= so.18
 54.endif
 55
 56.if exists(${LOCALBASE}/lib/libmysqlclient.${_MYSQL_SO_57})
61_MYSQL_VERSION_57_INSTALLED= yes 57_MYSQL_VERSION_57_INSTALLED= yes
62_MYSQL_VERSION_INSTALLED= 57 58_MYSQL_VERSION_INSTALLED= 57
63. endif 59.endif
64. if exists(${LOCALBASE}/lib/libmysqlclient.so.18) 60.if exists(${LOCALBASE}/lib/libmysqlclient.${_MYSQL_SO_56})
65. if exists(${LOCALBASE}/include/mysql/mysql/client_authentication.h) 61. if exists(${LOCALBASE}/include/mysql/mysql/client_authentication.h)
66_MYSQL_VERSION_56_INSTALLED= yes 62_MYSQL_VERSION_56_INSTALLED= yes
67_MYSQL_VERSION_INSTALLED= 56 63_MYSQL_VERSION_INSTALLED= 56
68. elif exists(${LOCALBASE}/share/mariadb) 64. elif exists(${LOCALBASE}/share/mariadb)
69_MYSQL_VERSION_MARIADB55_INSTALLED= yes 65_MYSQL_VERSION_MARIADB55_INSTALLED= yes
70_MYSQL_VERSION_INSTALLED= MARIADB55 66_MYSQL_VERSION_INSTALLED= MARIADB55
71. endif 
72. endif 67. endif
73.endif 68.endif
74 69
75 70
76# if a version is explicitely required, take it 71# if a version is explicitely required, take it
77.if defined(MYSQL_VERSION_REQD) 72.if defined(MYSQL_VERSION_REQD)
78_MYSQL_VERSION= ${MYSQL_VERSION_REQD} 73_MYSQL_VERSION= ${MYSQL_VERSION_REQD}
79.endif 74.endif
80# if the default is already installed, it is first choice 75# if the default is already installed, it is first choice
81.if !defined(_MYSQL_VERSION) 76.if !defined(_MYSQL_VERSION)
82. if defined(_MYSQL_VERSION_${MYSQL_VERSION_DEFAULT}_OK) 77. if defined(_MYSQL_VERSION_${MYSQL_VERSION_DEFAULT}_OK)
83. if defined(_MYSQL_VERSION_${MYSQL_VERSION_DEFAULT}_INSTALLED) 78. if defined(_MYSQL_VERSION_${MYSQL_VERSION_DEFAULT}_INSTALLED)
84_MYSQL_VERSION= ${MYSQL_VERSION_DEFAULT} 79_MYSQL_VERSION= ${MYSQL_VERSION_DEFAULT}