diff options
| author | manu <manu> | 2015-08-10 12:56:27 +0000 |
|---|---|---|
| committer | manu <manu> | 2015-08-10 12:56:27 +0000 |
| commit | f3a196b83a7e4333840268f6acd9fd9192c9ccbb (patch) | |
| tree | 5dfcb5b5e6312211e04c43ef5f9fc87bb3bd192f | |
| parent | 5d3e3f7588334b338a92ee303540a066d33d4de3 (diff) | |
| download | pkgsrc-f3a196b83a7e4333840268f6acd9fd9192c9ccbb.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
| -rw-r--r-- | databases/mariadb55-client/buildlink3.mk | 16 | ||||
| -rw-r--r-- | databases/php-mysqli/Makefile | 8 |
2 files changed, 9 insertions, 15 deletions
diff --git a/databases/mariadb55-client/buildlink3.mk b/databases/mariadb55-client/buildlink3.mk index 62e3f35dd19..eb3ba0c76f3 100644 --- a/databases/mariadb55-client/buildlink3.mk +++ b/databases/mariadb55-client/buildlink3.mk @@ -1,18 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.2 2015/05/07 12:45:28 fhajny Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2015/08/10 12:56:27 manu Exp $ -BUILDLINK_TREE+= mariadb-client +BUILDLINK_TREE+= mysql-client .if !defined(MARIADB_CLIENT_BUILDLINK3_MK) MARIADB_CLIENT_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.mariadb-client+= mariadb-client>=5.5.43 -BUILDLINK_PKGSRCDIR.mariadb-client?= ../../databases/mariadb55-client -BUILDLINK_PKGSRCDIR.mariadb-client?= ../../databases/mariadb55-client -BUILDLINK_INCDIRS.mariadb-client?= include/mysql -BUILDLINK_LIBDIRS.mariadb-client?= lib +BUILDLINK_API_DEPENDS.mysql-client+= mariadb-client>=5.5.43 +BUILDLINK_PKGSRCDIR.mysql-client?= ../../databases/mariadb55-client +BUILDLINK_PKGSRCDIR.mysql-client?= ../../databases/mariadb55-client +BUILDLINK_INCDIRS.mysql-client?= include/mysql +BUILDLINK_LIBDIRS.mysql-client?= lib .include "../../devel/zlib/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .endif # MARIADB_CLIENT_BUILDLINK3_MK -BUILDLINK_TREE+= -mariadb-client +BUILDLINK_TREE+= -mysql-client diff --git a/databases/php-mysqli/Makefile b/databases/php-mysqli/Makefile index 8ea4ba3be14..5dde2c3d897 100644 --- a/databases/php-mysqli/Makefile +++ b/databases/php-mysqli/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2015/04/16 20:27:09 ryoon Exp $ +# $NetBSD: Makefile,v 1.13 2015/08/10 12:56:27 manu Exp $ MODNAME= mysqli CATEGORIES+= databases @@ -18,13 +18,7 @@ PKG_SUGGESTED_OPTIONS= # empty CONFIGURE_ARGS+= --with-${MODNAME}=shared,mysqlnd .else . include "../../mk/mysql.buildlink3.mk" -. if !empty(_MYSQL_VERSION:MMARIADB*) -EVAL_PREFIX+= MYSQLDIR=mariadb-client -CONFIGURE_ARGS+= --with-${MODNAME}=${BUILDLINK_PREFIX.mariadb-client}/bin/mysql_config -. else -EVAL_PREFIX+= MYSQLDIR=mysql-client CONFIGURE_ARGS+= --with-${MODNAME}=${BUILDLINK_PREFIX.mysql-client}/bin/mysql_config -. endif .endif .include "../../lang/php/ext.mk" |