From 3674c3df233f3f3f6759705955860de9a54b1b95 Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Sat, 5 Feb 2022 11:05:39 +0900 Subject: [PATCH] [PATCH] cmake: add support for reproducible buildS . We should use relative path not absolute path. We can use target without breaking reproducibility. Gbp-Pq: Name mroonga-mrn-lib-dirs-path-reproducible-build.patch --- storage/mroonga/CMakeLists.txt | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/storage/mroonga/CMakeLists.txt b/storage/mroonga/CMakeLists.txt index 4553fd432..1cb8a9c95 100644 --- a/storage/mroonga/CMakeLists.txt +++ b/storage/mroonga/CMakeLists.txt @@ -214,7 +214,7 @@ set(MYSQL_INCLUDE_DIRS if(MRN_BUNDLED) set(MYSQL_PLUGIN_DIR "${INSTALL_PLUGINDIR}") - set(MYSQL_SERVICES_LIB_DIR "${MYSQL_BUILD_DIR}/libservices") + set(MYSQL_SERVICES_LIB_DIR) set(MYSQL_CFLAGS "${CMAKE_C_FLAGS}") set(MYSQL_VERSION "${MYSQL_BASE_VERSION}") else() @@ -253,15 +253,11 @@ endif() if(MRN_GROONGA_BUNDLED) set(GROONGA_INCLUDE_DIRS "${MRN_BUNDLED_GROONGA_DIR}/include") - set(GROONGA_LIBRARY_DIRS "${MRN_BUNDLED_GROONGA_DIR}/lib") - set(GROONGA_LIBRARIES "libgroonga") + set(GROONGA_LIBRARY "libgroonga") - set(MRN_LIBRARY_DIRS ${GROONGA_LIBRARY_DIRS}) - set(MRN_LIBRARIES ${GROONGA_LIBRARIES}) + set(MRN_LIBRARY_DIRS) + set(MRN_LIBRARIES ${GROONGA_LIBRARY}) if(MRN_GROONGA_NORMALIZER_MYSQL_EMBED) - set(MRN_LIBRARY_DIRS - ${MRN_LIBRARY_DIRS} - "${MRN_BUNDLED_GROONGA_NORMALIZER_MYSQL_DIR}/normalizers") set(MRN_LIBRARIES ${MRN_LIBRARIES} mysql_normalizer) endif() else() -- 2.30.2