From: Sutou Kouhei <kou@clear-code.com>
Date: Sat, 5 Feb 2022 02:05:39 +0000 (+0900)
Subject: [PATCH] cmake: add support for reproducible buildS . We should use relative path... 
X-Git-Tag: archive/raspbian/1%10.11.8-1+rpi1~1^2^2^2^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=399df7022cbaba07fbeca6c3cdc6b98eb6a40de7;p=mariadb.git

[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
---

diff --git a/storage/mroonga/CMakeLists.txt b/storage/mroonga/CMakeLists.txt
index c048b2146..04dde6257 100644
--- a/storage/mroonga/CMakeLists.txt
+++ b/storage/mroonga/CMakeLists.txt
@@ -219,7 +219,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()
@@ -258,15 +258,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()