Fix build of packages depending on mariadb55-client When a package depends on mysql-client, in includes mk/mysql-buildlink3.mk and may get buildlinked with mariadb55-client if MYSQL_VERSION_DEFAULT is set to MARIADB55. mariadb55-client's buildlink3.mk defined BUILDLINK_*.mariadb-client variables, wich caused build problems with packages expecting BUILDLINK_*.mysql-client to be defined. For instance, php-pdo_mysql expectex BUILDLINK_PREFIX.mysql-client to be set and fails to build without it. Fix the problem by changing BUILDLINK_*.mariadb-client to BUILDLINK_*.mysql-client in mariadb55-client/buildlink3.mk. Remove a package specific woakrround for this exact ptoblem in php-mysqli. NB: commit log on pkgsrc/databases/mariadb55-client/buildlink3.mk 1.2-1.3 and pkgsrc/databases/php-mysqli/Makefile 1.12-1.13 was truncated. This change just adds a comment to the first file and a null-commit to the second file to have an oportunity to provide the full cvs log.diff -r1.3 -r1.4 pkgsrc/databases/mariadb55-client/buildlink3.mk
(manu)
@@ -1,15 +1,19 @@ | @@ -1,15 +1,19 @@ | |||
1 | # $NetBSD: buildlink3.mk,v 1.3 2015/08/10 12:56:27 manu Exp $ | 1 | # $NetBSD: buildlink3.mk,v 1.4 2015/08/10 14:19:11 manu Exp $ | |
2 | 2 | |||
3 | # This buildlink file uses mysql-client and not mariadb-client, | |||
4 | # because some packages depending on it expect BUILDLINK_*.mysql-client | |||
5 | # to be set and will fail build if they get BUILDLINK_*.mariadb-client | |||
6 | # instead. | |||
3 | BUILDLINK_TREE+= mysql-client | 7 | BUILDLINK_TREE+= mysql-client | |
4 | 8 | |||
5 | .if !defined(MARIADB_CLIENT_BUILDLINK3_MK) | 9 | .if !defined(MARIADB_CLIENT_BUILDLINK3_MK) | |
6 | MARIADB_CLIENT_BUILDLINK3_MK:= | 10 | MARIADB_CLIENT_BUILDLINK3_MK:= | |
7 | 11 | |||
8 | BUILDLINK_API_DEPENDS.mysql-client+= mariadb-client>=5.5.43 | 12 | BUILDLINK_API_DEPENDS.mysql-client+= mariadb-client>=5.5.43 | |
9 | BUILDLINK_PKGSRCDIR.mysql-client?= ../../databases/mariadb55-client | 13 | BUILDLINK_PKGSRCDIR.mysql-client?= ../../databases/mariadb55-client | |
10 | BUILDLINK_PKGSRCDIR.mysql-client?= ../../databases/mariadb55-client | 14 | BUILDLINK_PKGSRCDIR.mysql-client?= ../../databases/mariadb55-client | |
11 | BUILDLINK_INCDIRS.mysql-client?= include/mysql | 15 | BUILDLINK_INCDIRS.mysql-client?= include/mysql | |
12 | BUILDLINK_LIBDIRS.mysql-client?= lib | 16 | BUILDLINK_LIBDIRS.mysql-client?= lib | |
13 | 17 | |||
14 | .include "../../devel/zlib/buildlink3.mk" | 18 | .include "../../devel/zlib/buildlink3.mk" | |
15 | .include "../../security/openssl/buildlink3.mk" | 19 | .include "../../security/openssl/buildlink3.mk" |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: Makefile,v 1.20 2014/06/13 14:17:07 fhajny Exp $ | 1 | # $NetBSD: Makefile,v 1.21 2015/08/10 14:19:11 manu Exp $ | |
2 | 2 | |||
3 | MODNAME= mysql | 3 | MODNAME= mysql | |
4 | CATEGORIES+= databases | 4 | CATEGORIES+= databases | |
5 | COMMENT= PHP extension for MySQL databases | 5 | COMMENT= PHP extension for MySQL databases | |
6 | 6 | |||
7 | MAINTAINER= pkgsrc-users@NetBSD.org | 7 | MAINTAINER= pkgsrc-users@NetBSD.org | |
8 | 8 | |||
9 | CONFLICTS= php-mysql-[0-9]* | 9 | CONFLICTS= php-mysql-[0-9]* | |
10 | 10 | |||
11 | USE_PHP_EXT_PATCHES= yes | 11 | USE_PHP_EXT_PATCHES= yes | |
12 | 12 | |||
13 | PKG_OPTIONS_VAR= PKG_OPTIONS.php-mysql | 13 | PKG_OPTIONS_VAR= PKG_OPTIONS.php-mysql | |
14 | PKG_SUPPORTED_OPTIONS= mysqlnd | 14 | PKG_SUPPORTED_OPTIONS= mysqlnd |