diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2019-12-01 19:50:45 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2019-12-01 19:50:45 +0000 |
| commit | bd64517c7f611b9a878e0138d06e56e51eb74cff (patch) | |
| tree | 8d85df680c0b31b35e52f657237267e3fd4772f4 /databases/mariadb104-server | |
| parent | f305521a03f28b26933fa0586e97049b41ca925e (diff) | |
| download | ports-bd64517c7f611b9a878e0138d06e56e51eb74cff.tar.gz ports-bd64517c7f611b9a878e0138d06e56e51eb74cff.zip | |
databases/mariadb104-server: Fix include clash with c++/v1/version
Notes
Notes:
svn path=/head/; revision=518809
Diffstat (limited to 'databases/mariadb104-server')
| -rw-r--r-- | databases/mariadb104-server/Makefile | 1 | ||||
| -rw-r--r-- | databases/mariadb104-server/files/patch-storage_mroonga_CMakeLists.txt | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/databases/mariadb104-server/Makefile b/databases/mariadb104-server/Makefile index 5b687cc12ac2..3de05b804cef 100644 --- a/databases/mariadb104-server/Makefile +++ b/databases/mariadb104-server/Makefile @@ -192,6 +192,7 @@ post-patch: ${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/my_default.c ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scripts/mysql_config.sh \ ${WRKSRC}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake + ${MV} ${WRKSRC}/storage/mroonga/version ${WRKSRC}/storage/mroonga/version_txt .if ${OPSYS} == DragonFly ${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \ ${WRKSRC}/cmake/os/DragonFly.cmake diff --git a/databases/mariadb104-server/files/patch-storage_mroonga_CMakeLists.txt b/databases/mariadb104-server/files/patch-storage_mroonga_CMakeLists.txt new file mode 100644 index 000000000000..3a9984980272 --- /dev/null +++ b/databases/mariadb104-server/files/patch-storage_mroonga_CMakeLists.txt @@ -0,0 +1,11 @@ +--- storage/mroonga/CMakeLists.txt.orig 2019-11-06 16:01:58 UTC ++++ storage/mroonga/CMakeLists.txt +@@ -80,7 +80,7 @@ else() + set(MRN_SOURCE_DIR ${CMAKE_SOURCE_DIR}) + endif() + +-file(READ ${MRN_SOURCE_DIR}/version MRN_VERSION) ++file(READ ${MRN_SOURCE_DIR}/version_txt MRN_VERSION) + file(READ ${MRN_SOURCE_DIR}/version_major MRN_VERSION_MAJOR) + file(READ ${MRN_SOURCE_DIR}/version_minor MRN_VERSION_MINOR) + file(READ ${MRN_SOURCE_DIR}/version_micro MRN_VERSION_MICRO) |