diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-04 18:04:23 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-04 18:04:23 +0000 |
| commit | 9a6158e391576f265fbd7d0da2778ecad1dbecd5 (patch) | |
| tree | 1409a92dae3e99541a9283fed1d0409adb033557 /debian/patches/mroonga-mrn-lib-dirs-path-reproducible-build.patch | |
| parent | Adding upstream version 1:10.6.11. (diff) | |
| download | mariadb-10.6-9a6158e391576f265fbd7d0da2778ecad1dbecd5.tar.xz mariadb-10.6-9a6158e391576f265fbd7d0da2778ecad1dbecd5.zip | |
Adding debian version 1:10.6.11-2.debian/1%10.6.11-2debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
| -rw-r--r-- | debian/patches/mroonga-mrn-lib-dirs-path-reproducible-build.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/debian/patches/mroonga-mrn-lib-dirs-path-reproducible-build.patch b/debian/patches/mroonga-mrn-lib-dirs-path-reproducible-build.patch new file mode 100644 index 00000000..45c84cce --- /dev/null +++ b/debian/patches/mroonga-mrn-lib-dirs-path-reproducible-build.patch @@ -0,0 +1,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() |