blob: 45c84ccea1b54106be8de6f69a9f080b387d00f9 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
Origin: upstream, https://github.com/mroonga/mroonga/issues/298#issuecomment-1030815927
Bug: https://github.com/mroonga/mroonga/issues/298
Forwarded: not-needed
Author: Sutou Kouhei <kou@clear-code.com>
Date: Sat, 5 Feb 2022 11:05:39 +0900
Subject: [PATCH] cmake: add support for reproducible buildS
.
We should use relative path not absolute path.
We can use target without breaking reproducibility.
--- 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()
|
