diff options
| author | CoprDistGit <infra@openeuler.org> | 2023-08-20 10:47:28 +0000 |
|---|---|---|
| committer | CoprDistGit <infra@openeuler.org> | 2023-08-20 10:47:28 +0000 |
| commit | f0b08fdbf2ac1c6bbbeba9a96babfae8277ed3ef (patch) | |
| tree | eeb9a49118267c48caeefb2bbfa3f9f8ba1e3658 /mariadb-pcdir.patch | |
| parent | de830acca23eae53159e3721fc648ce8a86427b7 (diff) | |
automatic import of mariadbopeneuler23.03openeuler22.03_LTS_SP2openeuler22.03_LTSopeneuler20.03
Diffstat (limited to 'mariadb-pcdir.patch')
| -rw-r--r-- | mariadb-pcdir.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/mariadb-pcdir.patch b/mariadb-pcdir.patch new file mode 100644 index 0000000..117273a --- /dev/null +++ b/mariadb-pcdir.patch @@ -0,0 +1,19 @@ +Use PCDIR CMake option, if configured + +Upstream install the server pkgconfig file into arch-independent directory +Reported to upstream as: https://jira.mariadb.org/browse/MDEV-14340 + +--- mariadb-10.5.5/support-files/CMakeLists.txt.old 2020-09-30 10:36:08.582490318 +0200 ++++ mariadb-10.5.5/support-files/CMakeLists.txt 2020-09-30 10:38:58.079710848 +0200 +@@ -91,7 +91,11 @@ + ENDIF() + + CONFIGURE_FILE(mariadb.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc @ONLY) ++IF(INSTALL_PCDIR) ++ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_PCDIR} COMPONENT Development) ++ELSE() + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_LIBDIR}/pkgconfig COMPONENT Development) ++ENDIF() + + INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) + |