Mon Aug 10 14:19:11 2015 UTC ()
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.


(manu)
diff -r1.3 -r1.4 pkgsrc/databases/mariadb55-client/buildlink3.mk
diff -r1.20 -r1.21 pkgsrc/databases/php-mysql/Makefile

cvs diff -r1.3 -r1.4 pkgsrc/databases/mariadb55-client/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/databases/mariadb55-client/Attic/buildlink3.mk 2015/08/10 12:56:27 1.3
+++ pkgsrc/databases/mariadb55-client/Attic/buildlink3.mk 2015/08/10 14:19:11 1.4
@@ -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.
3BUILDLINK_TREE+= mysql-client 7BUILDLINK_TREE+= mysql-client
4 8
5.if !defined(MARIADB_CLIENT_BUILDLINK3_MK) 9.if !defined(MARIADB_CLIENT_BUILDLINK3_MK)
6MARIADB_CLIENT_BUILDLINK3_MK:= 10MARIADB_CLIENT_BUILDLINK3_MK:=
7 11
8BUILDLINK_API_DEPENDS.mysql-client+= mariadb-client>=5.5.43 12BUILDLINK_API_DEPENDS.mysql-client+= mariadb-client>=5.5.43
9BUILDLINK_PKGSRCDIR.mysql-client?= ../../databases/mariadb55-client 13BUILDLINK_PKGSRCDIR.mysql-client?= ../../databases/mariadb55-client
10BUILDLINK_PKGSRCDIR.mysql-client?= ../../databases/mariadb55-client 14BUILDLINK_PKGSRCDIR.mysql-client?= ../../databases/mariadb55-client
11BUILDLINK_INCDIRS.mysql-client?= include/mysql 15BUILDLINK_INCDIRS.mysql-client?= include/mysql
12BUILDLINK_LIBDIRS.mysql-client?= lib 16BUILDLINK_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"

cvs diff -r1.20 -r1.21 pkgsrc/databases/php-mysql/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/php-mysql/Makefile 2014/06/13 14:17:07 1.20
+++ pkgsrc/databases/php-mysql/Makefile 2015/08/10 14:19:11 1.21
@@ -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
3MODNAME= mysql 3MODNAME= mysql
4CATEGORIES+= databases 4CATEGORIES+= databases
5COMMENT= PHP extension for MySQL databases 5COMMENT= PHP extension for MySQL databases
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8 8
9CONFLICTS= php-mysql-[0-9]* 9CONFLICTS= php-mysql-[0-9]*
10 10
11USE_PHP_EXT_PATCHES= yes 11USE_PHP_EXT_PATCHES= yes
12 12
13PKG_OPTIONS_VAR= PKG_OPTIONS.php-mysql 13PKG_OPTIONS_VAR= PKG_OPTIONS.php-mysql
14PKG_SUPPORTED_OPTIONS= mysqlnd 14PKG_SUPPORTED_OPTIONS= mysqlnd