diff options
| author | Mikhail Teterin <mi@FreeBSD.org> | 2016-01-05 17:29:49 +0000 |
|---|---|---|
| committer | Mikhail Teterin <mi@FreeBSD.org> | 2016-01-05 17:29:49 +0000 |
| commit | d99dd48eadd8505fbdf3cb9979f1ec7fb98d936b (patch) | |
| tree | 06f14411ebf2216ecc83e5b5fc7dfc9e36cf62f6 /databases | |
| parent | 9391123a3bcb6e76e161dbe22048faf9c0a6dfef (diff) | |
| download | ports-d99dd48eadd8505fbdf3cb9979f1ec7fb98d936b.tar.gz ports-d99dd48eadd8505fbdf3cb9979f1ec7fb98d936b.zip | |
Add additional CMAKE-argument to avoid build-time conflicts between
Boost-1_59 used privately by this port and Boost-1_55 installed by
its own port.
While at it, replace WRKSRC/.. with simply WRKDIR.
PR: 205815
Approved by: maintainer
Notes
Notes:
svn path=/head/; revision=405305
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mysql57-client/Makefile | 1 | ||||
| -rw-r--r-- | databases/mysql57-server/Makefile | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/databases/mysql57-client/Makefile b/databases/mysql57-client/Makefile index ca3c22e3ced2..67b1d94224c7 100644 --- a/databases/mysql57-client/Makefile +++ b/databases/mysql57-client/Makefile @@ -14,7 +14,6 @@ PKGMESSAGE= ${.CURDIR}/pkg-message PATCHDIR= ${.CURDIR}/files PLIST= ${.CURDIR}/pkg-plist -CONFLICTS_BUILD= boost-libs-1.55* CONFLICTS_INSTALL= mysql5.[0-57-9]-client-* mysql[0-46-9][0-9]-client-* mariadb[0-9][0-9]-client-* percona[0-9][0-9]-client-* CMAKE_ARGS+= -DINSTALL_PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig \ diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile index 99d64eaddf46..8d891a3b7c0c 100644 --- a/databases/mysql57-server/Makefile +++ b/databases/mysql57-server/Makefile @@ -40,7 +40,8 @@ CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ -DINSTALL_SCRIPTDIR="bin" \ -DINSTALL_SHAREDIR="share" \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ - -DLOCAL_BOOST_DIR=${WRKSRC}/../boost_1_59_0 \ + -DLOCAL_BOOST_DIR=${WRKDIR}/boost_1_59_0 \ + -DBOOST_INCLUDE_DIR=${WRKDIR}/boost_1_59_0 \ -DWITH_INNODB_EXTRA_DEBUG=0 SHEBANG_FILES= scripts/*.pl* scripts/*.sh @@ -61,7 +62,6 @@ WANT_MYSQL_VER= 57 USES+= bison:build cpe perl5 USE_PERL5= run -CONFLICTS_BUILD= boost-libs-1.55* CONFLICTS_INSTALL= mariadb[0-9]*-server-* \ mysql[0-46-9][0-689]-server-* \ percona[0-9]*-server-* |