summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
authormanu <manu@pkgsrc.org>2015-08-10 14:19:11 +0000
committermanu <manu@pkgsrc.org>2015-08-10 14:19:11 +0000
commit84fd07fa8c5257f2b956ecd2d9a72d21b2fbeb74 (patch)
treed60f095adee75f3c564844764899a4c9bafc2129 /databases
parent9fe97066fa0f5602a09728219bfd4b07cf1a6488 (diff)
downloadpkgsrc-84fd07fa8c5257f2b956ecd2d9a72d21b2fbeb74.tar.gz
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.
Diffstat (limited to 'databases')
-rw-r--r--databases/mariadb55-client/buildlink3.mk6
-rw-r--r--databases/php-mysql/Makefile2
2 files changed, 6 insertions, 2 deletions
diff --git a/databases/mariadb55-client/buildlink3.mk b/databases/mariadb55-client/buildlink3.mk
index eb3ba0c76f3..033fa5d1d33 100644
--- a/databases/mariadb55-client/buildlink3.mk
+++ b/databases/mariadb55-client/buildlink3.mk
@@ -1,5 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.3 2015/08/10 12:56:27 manu Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2015/08/10 14:19:11 manu Exp $
+# This buildlink file uses mysql-client and not mariadb-client,
+# because some packages depending on it expect BUILDLINK_*.mysql-client
+# to be set and will fail build if they get BUILDLINK_*.mariadb-client
+# instead.
BUILDLINK_TREE+= mysql-client
.if !defined(MARIADB_CLIENT_BUILDLINK3_MK)
diff --git a/databases/php-mysql/Makefile b/databases/php-mysql/Makefile
index dfd293f053f..679c99faa57 100644
--- a/databases/php-mysql/Makefile
+++ b/databases/php-mysql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2014/06/13 14:17:07 fhajny Exp $
+# $NetBSD: Makefile,v 1.21 2015/08/10 14:19:11 manu Exp $
MODNAME= mysql
CATEGORIES+= databases