From 65e3d0853860d4991430b49949d01d60b8dc97f1 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Tue, 27 Jul 2021 19:21:39 +0200 Subject: MDEV-7209 mroonga storage engine fails to build on OpenBSD rename files `version` -> `version_full` --- storage/mroonga/CMakeLists.txt | 2 +- .../groonga/vendor/plugins/groonga-normalizer-mysql/CMakeLists.txt | 2 +- .../vendor/groonga/vendor/plugins/groonga-normalizer-mysql/version | 1 - .../vendor/groonga/vendor/plugins/groonga-normalizer-mysql/version_full | 1 + storage/mroonga/version | 1 - storage/mroonga/version_full | 1 + 6 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/version create mode 100644 storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/version_full delete mode 100644 storage/mroonga/version create mode 100644 storage/mroonga/version_full diff --git a/storage/mroonga/CMakeLists.txt b/storage/mroonga/CMakeLists.txt index 317c337e247..6671b3a8d56 100644 --- a/storage/mroonga/CMakeLists.txt +++ b/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_full 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) diff --git a/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/CMakeLists.txt b/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/CMakeLists.txt index 80e531e5319..96e3f1a570d 100644 --- a/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/CMakeLists.txt +++ b/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/CMakeLists.txt @@ -29,7 +29,7 @@ option(GROONGA_NORMALIZER_MYSQL_EMBED "Build as a static library to embed into an application" ${GROONGA_NORMALIZER_MYSQL_EMBED_DEFAULT}) -file(READ "${CMAKE_CURRENT_SOURCE_DIR}/version" VERSION) +file(READ "${CMAKE_CURRENT_SOURCE_DIR}/version_full" VERSION) if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") set(GROONGA_NORMALIZER_MYSQL_BUNDLED FALSE) diff --git a/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/version b/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/version deleted file mode 100644 index 8cfbc905b39..00000000000 --- a/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/version +++ /dev/null @@ -1 +0,0 @@ -1.1.1 \ No newline at end of file diff --git a/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/version_full b/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/version_full new file mode 100644 index 00000000000..8cfbc905b39 --- /dev/null +++ b/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/version_full @@ -0,0 +1 @@ +1.1.1 \ No newline at end of file diff --git a/storage/mroonga/version b/storage/mroonga/version deleted file mode 100644 index 5b1f56847ae..00000000000 --- a/storage/mroonga/version +++ /dev/null @@ -1 +0,0 @@ -7.07 \ No newline at end of file diff --git a/storage/mroonga/version_full b/storage/mroonga/version_full new file mode 100644 index 00000000000..5b1f56847ae --- /dev/null +++ b/storage/mroonga/version_full @@ -0,0 +1 @@ +7.07 \ No newline at end of file -- cgit v1.2.1